Bladeren bron

Merge pull request #2080 from Areloch/ShaderCommonPathOrderFix

Fixes smCommonShaderPath init order
Areloch 8 jaren geleden
bovenliggende
commit
cd2b97819d
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  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])
    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,