Browse Source

better handle old style references to named texture targets

AzaezelX 3 years ago
parent
commit
e211f502e8
2 changed files with 7 additions and 2 deletions
  1. 6 1
      Engine/source/T3D/assets/ImageAsset.h
  2. 1 1
      Engine/source/postFx/postEffect.cpp

+ 6 - 1
Engine/source/T3D/assets/ImageAsset.h

@@ -405,7 +405,12 @@ public: \
       else if (m##name##AssetId[index] != StringTable->EmptyString())\
       else if (m##name##AssetId[index] != StringTable->EmptyString())\
          return m##name##AssetId[index];\
          return m##name##AssetId[index];\
       else if (m##name##Name[index] != StringTable->EmptyString())\
       else if (m##name##Name[index] != StringTable->EmptyString())\
-         return StringTable->insert(Platform::makeRelativePathName(m##name##Name[index], Platform::getMainDotCsDir()));\
+      {\
+         if (String(m##name##Name[index]).startsWith("#") || String(m##name##Name[index]).startsWith("$"))\
+            return StringTable->insert(m##name##Name[index]);\
+         else\
+            return StringTable->insert(Platform::makeRelativePathName(m##name##Name[index], Platform::getMainDotCsDir()));\
+      }\
       else\
       else\
          return StringTable->EmptyString();\
          return StringTable->EmptyString();\
    }\
    }\

+ 1 - 1
Engine/source/postFx/postEffect.cpp

@@ -1122,7 +1122,7 @@ void PostEffect::_setupConstants( const SceneRenderState *state )
 
 
 void PostEffect::_setupTexture( U32 stage, GFXTexHandle &inputTex, const RectI *inTexViewport )
 void PostEffect::_setupTexture( U32 stage, GFXTexHandle &inputTex, const RectI *inTexViewport )
 {
 {
-   const String &texFilename = mTextureName[ stage ];
+   const String &texFilename = getTexture( stage );
 
 
    GFXTexHandle theTex;
    GFXTexHandle theTex;
    NamedTexTarget *namedTarget = NULL;
    NamedTexTarget *namedTarget = NULL;