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

Merge pull request #2080 from Areloch/ShaderCommonPathOrderFix

Browse source 
Fixes smCommonShaderPath init order
This commit is contained in:
Areloch 2017-09-17 04:20:29 -05:00 • committed by GitHub
commit 620cbfcda4
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/shaderGen/shaderGen.cpp
View file

@ -96,6 +96,8 @@ void ShaderGen::initShaderGen()
if (!mInitDelegates[adapterType]) if (!mInitDelegates[adapterType])
return; return;
smCommonShaderPath = String(Con::getVariable("$Core::CommonShaderPath", "shaders/common"));
mInitDelegates[adapterType](this); mInitDelegates[adapterType](this);
mFeatureInitSignal.trigger( adapterType ); mFeatureInitSignal.trigger( adapterType );
mInit = true; mInit = true;
@ -125,8 +127,6 @@ void ShaderGen::initShaderGen()
// Delete the auto-generated conditioner include file. // Delete the auto-generated conditioner include file.
Torque::FS::Remove( "shadergen:/" + ConditionerFeature::ConditionerIncludeFileName ); Torque::FS::Remove( "shadergen:/" + ConditionerFeature::ConditionerIncludeFileName );
smCommonShaderPath = String(Con::getVariable("$Core::CommonShaderPath", "shaders/common"));
} }
void ShaderGen::generateShader( const MaterialFeatureData &featureData, void ShaderGen::generateShader( const MaterialFeatureData &featureData,