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

Merge pull request #661 from Azaezel/alpha40/namedtexturetargs

Browse source 
better handle old style references to named texture targets
This commit is contained in:
Brian Roberts 2021-11-08 14:38:11 -06:00 • committed by GitHub
commit 4e51ac17bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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();\
}\ }\

2
Engine/source/postFx/postEffect.cpp
View file

@ -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;