Browse Source

Merge pull request #2080 from Areloch/ShaderCommonPathOrderFix

Fixes smCommonShaderPath init order
Areloch 8 years ago
parent
commit
cd2b97819d
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Engine/source/shaderGen/shaderGen.cpp

+ 2 - 2
Engine/source/shaderGen/shaderGen.cpp

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