Prechádzať zdrojové kódy

account for the possiblity of _set##name(StringTableEntry _in entries somehow getting punted nulls

AzaezelX 4 rokov pred
rodič
commit
bdf6bd5c69

+ 2 - 2
Engine/source/T3D/assets/ImageAsset.h

@@ -176,7 +176,7 @@ public: \
          {\
             m##name##Asset->getChangedSignal().remove(this, &className::changeFunc);\
          }\
-         if (_in == StringTable->EmptyString())\
+         if (_in == NULL || _in == StringTable->EmptyString())\
          {\
             m##name##Name = StringTable->EmptyString();\
             m##name##AssetId = StringTable->EmptyString();\
@@ -400,7 +400,7 @@ public: \
       {\
          if(index >= sm##name##Count || index < 0)\
             return false;\
-         if (_in == StringTable->EmptyString())\
+         if (_in == NULL || _in == StringTable->EmptyString())\
          {\
             m##name##Name[index] = StringTable->EmptyString();\
             m##name##AssetId[index] = StringTable->EmptyString();\

+ 1 - 1
Engine/source/T3D/assets/MaterialAsset.h

@@ -168,7 +168,7 @@ public: \
    {\
       if(m##name##AssetId != _in || m##name##Name != _in)\
       {\
-         if (_in == StringTable->EmptyString())\
+         if (_in == NULL || _in == StringTable->EmptyString())\
          {\
             m##name##Name = StringTable->EmptyString();\
             m##name##AssetId = StringTable->EmptyString();\

+ 2 - 2
Engine/source/T3D/assets/ShapeAsset.h

@@ -241,7 +241,7 @@ public: \
          {\
             m##name##Asset->getChangedSignal().remove(this, &className::changeFunc);\
          }\
-         if (_in == StringTable->EmptyString())\
+         if (_in == NULL || _in == StringTable->EmptyString())\
          {\
             m##name##Name = StringTable->EmptyString();\
             m##name##AssetId = StringTable->EmptyString();\
@@ -439,7 +439,7 @@ public: \
       {\
          if(index >= sm##name##Count || index < 0)\
             return false;\
-         if (_in == StringTable->EmptyString())\
+         if (_in == NULL || _in == StringTable->EmptyString())\
          {\
             m##name##Name[index] = StringTable->EmptyString();\
             m##name##AssetId[index] = StringTable->EmptyString();\

+ 1 - 1
Engine/source/T3D/assets/SoundAsset.h

@@ -184,7 +184,7 @@ public: \
    {\
       if(m##name##AssetId != _in || m##name##Name != _in)\
       {\
-         if (_in == StringTable->EmptyString())\
+         if (_in == NULL || _in == StringTable->EmptyString())\
          {\
             m##name##Name = StringTable->EmptyString();\
             m##name##AssetId = StringTable->EmptyString();\