TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 22:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add extra checks

Browse source 
add extra checks around an empty stringtableentry for assets and bitmap controls
This commit is contained in:
marauder2k7 2025-06-19 16:58:44 +01:00
parent 1949ff9d7b
commit 08f52cfa16
4 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -243,7 +243,7 @@ public:
return; \
if(get##name##File() == _in) \
return; \
if(_in == NULL || _in == StringTable->EmptyString()) \
if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \
m##name##Asset = NULL; \
m##name##File = ""; \
@ -300,7 +300,7 @@ public:
return; \
if(get##name##File() == _in) \
return; \
if(_in == NULL || _in == StringTable->EmptyString()) \
if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \
m##name##Asset = NULL; \
m##name##File = ""; \
@ -364,7 +364,7 @@ public:
return; \
if(get##name##File(index) == _in) \
return; \
if(_in == NULL || _in == StringTable->EmptyString()) \
if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \
m##name##Asset[index] = NULL; \
m##name##File[index] = ""; \
@ -422,7 +422,7 @@ public:
return; \
if(get##name##File(index) == _in) \
return; \
if(_in == NULL || _in == StringTable->EmptyString()) \
if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \
m##name##Asset[index] = NULL; \
m##name##File[index] = ""; \

6
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -513,7 +513,7 @@ public:
return; \
if(get##name##File() == _in) \
return; \
if (_in == NULL || _in == StringTable->EmptyString()) \
if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \
m##name##Asset = NULL; \
m##name##File = ""; \
@ -569,7 +569,7 @@ public:
return; \
if(get##name##File() == _in) \
return; \
if (_in == NULL || _in == StringTable->EmptyString()) \
if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \
m##name##Asset = NULL; \
m##name##File = ""; \
@ -632,7 +632,7 @@ public:
return; \
if(get##name##File(index) == _in) \
return; \
if (_in == NULL || _in == StringTable->EmptyString()) \
if(_in == NULL || _in == StringTable->EmptyString() || _in == "") \
{ \
m##name##Asset[index] = NULL; \
m##name##File[index] = ""; \