TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

purge assets and clear image

Browse source 
image asset was missing a clear, passing a null value should clear the image asset and set it to null on materials.
This commit is contained in:
marauder2k7 2025-05-14 00:57:38 +01:00
parent aa3f07e339
commit 6870a040e2
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Engine/source/T3D/assets/ImageAsset.h
View file

@ -249,7 +249,11 @@ public:
void _set##name(StringTableEntry _in){ \ void _set##name(StringTableEntry _in){ \
if(m##name##Asset.getAssetId() == _in) \ if(m##name##Asset.getAssetId() == _in) \
return; \ return; \
\ if(_in == NULL || _in == StringTable->EmptyString()) \
{ \
m##name##Asset = NULL; \
return; \
} \
if(!AssetDatabase.isDeclaredAsset(_in)) \ if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \ { \
StringTableEntry imageAssetId = StringTable->EmptyString(); \ StringTableEntry imageAssetId = StringTable->EmptyString(); \
@ -296,6 +300,12 @@ public:
void _set##name(StringTableEntry _in){ \ void _set##name(StringTableEntry _in){ \
if(m##name##Asset.getAssetId() == _in) \ if(m##name##Asset.getAssetId() == _in) \
return; \ return; \
if(_in == NULL || _in == StringTable->EmptyString()) \
{ \
m##name##Asset = NULL; \
setMaskBits(mask); \
return; \
} \
if(!AssetDatabase.isDeclaredAsset(_in)) \ if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \ { \
StringTableEntry imageAssetId = StringTable->EmptyString(); \ StringTableEntry imageAssetId = StringTable->EmptyString(); \
@ -347,6 +357,11 @@ public:
void _set##name(StringTableEntry _in, const U32& index){ \ void _set##name(StringTableEntry _in, const U32& index){ \
if(m##name##Asset[index].getAssetId() == _in) \ if(m##name##Asset[index].getAssetId() == _in) \
return; \ return; \
if(_in == NULL || _in == StringTable->EmptyString()) \
{ \
m##name##Asset[index] = NULL; \
return; \
} \
if(!AssetDatabase.isDeclaredAsset(_in)) \ if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \ { \
StringTableEntry imageAssetId = StringTable->EmptyString(); \ StringTableEntry imageAssetId = StringTable->EmptyString(); \
@ -394,6 +409,12 @@ public:
void _set##name(StringTableEntry _in, const U32& index){ \ void _set##name(StringTableEntry _in, const U32& index){ \
if(m##name##Asset[index].getAssetId() == _in) \ if(m##name##Asset[index].getAssetId() == _in) \
return; \ return; \
if(_in == NULL || _in == StringTable->EmptyString()) \
{ \
m##name##Asset[index] = NULL; \
setMaskBits(mask); \
return; \
} \
if(!AssetDatabase.isDeclaredAsset(_in)) \ if(!AssetDatabase.isDeclaredAsset(_in)) \
{ \ { \
StringTableEntry imageAssetId = StringTable->EmptyString(); \ StringTableEntry imageAssetId = StringTable->EmptyString(); \

2
Engine/source/assets/assetManager.cpp
View file

@ -119,6 +119,8 @@ void AssetManager::onRemove()
mAssetTagsManifest->deleteObject(); mAssetTagsManifest->deleteObject();
} }
purgeAssets();
// Call parent. // Call parent.
Parent::onRemove(); Parent::onRemove();
} }