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

Moves the initialization of the shader common path const var so it is set before we do an initial setup of some shadergen fields.

Browse source
This commit is contained in:
Areloch 2017-09-11 23:48:49 -05:00
parent df619808cd
commit 5220032bd4
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,