diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h index ff50ef655..b79dc5f5d 100644 --- a/Engine/source/T3D/assets/ImageAsset.h +++ b/Engine/source/T3D/assets/ImageAsset.h @@ -345,7 +345,6 @@ if (m##name##AssetId != StringTable->EmptyString())\ if (stream->writeFlag(m##name##Asset.notNull()))\ {\ stream->writeString(m##name##Asset.getAssetId());\ - _set##name(m##name##AssetId);\ }\ else\ stream->writeString(m##name##Name); @@ -354,9 +353,13 @@ if (m##name##AssetId != StringTable->EmptyString())\ if (stream->readFlag())\ {\ m##name##AssetId = stream->readSTString();\ + _set##name(m##name##AssetId);\ }\ else\ - m##name##Name = stream->readSTString(); + {\ + m##name##Name = stream->readSTString();\ + _set##name(m##name##Name);\ + }\ #define PACK_IMAGEASSET(netconn, name)\ if (stream->writeFlag(m##name##Asset.notNull()))\ @@ -591,7 +594,10 @@ if (m##name##AssetId[index] != StringTable->EmptyString())\ _set##name(m##name##AssetId[index], index);\ }\ else\ - m##name##Name[index] = stream->readSTString(); + {\ + m##name##Name[index] = stream->readSTString();\ + _set##name(m##name##Name[index], index);\ + }\ #define PACK_IMAGEASSET_ARRAY(netconn, name, index)\ if (stream->writeFlag(m##name##Asset[index].notNull()))\ diff --git a/Engine/source/T3D/assets/MaterialAsset.h b/Engine/source/T3D/assets/MaterialAsset.h index 07ec0227a..c747be793 100644 --- a/Engine/source/T3D/assets/MaterialAsset.h +++ b/Engine/source/T3D/assets/MaterialAsset.h @@ -346,7 +346,10 @@ if (m##name##AssetId != StringTable->EmptyString())\ _set##name(m##name##AssetId);\ }\ else\ - m##name##Name = stream->readSTString(); + {\ + m##name##Name = stream->readSTString();\ + _set##name(m##name##Name);\ + }\ #define PACK_MATERIALASSET(netconn, name)\ if (stream->writeFlag(m##name##Asset.notNull()))\ diff --git a/Engine/source/T3D/assets/ShapeAsset.h b/Engine/source/T3D/assets/ShapeAsset.h index d5c899564..d3af516c5 100644 --- a/Engine/source/T3D/assets/ShapeAsset.h +++ b/Engine/source/T3D/assets/ShapeAsset.h @@ -397,7 +397,10 @@ DefineEngineMethod(className, set##name, bool, (const char* shape), , assetText _set##name(m##name##AssetId);\ }\ else\ - m##name##Name = stream->readSTString(); + {\ + m##name##Name = stream->readSTString();\ + _set##name(m##name##Name);\ + } #define PACK_SHAPEASSET(netconn, name)\ if (stream->writeFlag(m##name##Asset.notNull()))\ @@ -609,7 +612,10 @@ DefineEngineMethod(className, set##name, bool, (const char* shape, S32 index), _set##name(m##name##AssetId[index], index);\ }\ else\ - m##name##Name[index] = stream->readSTString(); + {\ + m##name##Name[index] = stream->readSTString();\ + _set##name(m##name##Name[index], index);\ + } #define PACK_SHAPEASSET_ARRAY(netconn, name, index)\ if (stream->writeFlag(m##name##Asset[index].notNull()))\ diff --git a/Engine/source/T3D/assets/SoundAsset.h b/Engine/source/T3D/assets/SoundAsset.h index df0ac0d6b..ca83e477b 100644 --- a/Engine/source/T3D/assets/SoundAsset.h +++ b/Engine/source/T3D/assets/SoundAsset.h @@ -344,7 +344,10 @@ DefineEngineMethod(className, set##name, bool, (const char* shape), , assetText _set##name(m##name##AssetId);\ }\ else\ - m##name##Name = stream->readSTString(); + {\ + m##name##Name = stream->readSTString();\ + _set##name(m##name##Name);\ + } #define PACK_SOUNDASSET(netconn, name)\ if (stream->writeFlag(m##name##Asset.notNull()))\