Merge pull request #1223 from Azaezel/detailNormalOrderOfOperations

DeferredBumpFeat order of operations corrections

Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp

@@ -225,10 +225,10 @@ void DeferredBumpFeatGLSL::processVert(   Vector<ShaderComponent*> &componentLis
       // We need the view to tangent space transform in the pixel shader.
       getOutViewToTangent( componentList, meta, fd );
 
+      const bool useTexAnim = fd.features[MFT_TexAnim];
       // Make sure there are texcoords
       if( !fd.features[MFT_Parallax] && !fd.features[MFT_DiffuseMap] )
       {
-         const bool useTexAnim = fd.features[MFT_TexAnim];
 
          getOutTexCoord(   "texCoord", 
                            "vec2", 
@@ -236,12 +236,12 @@ void DeferredBumpFeatGLSL::processVert(   Vector<ShaderComponent*> &componentLis
                            useTexAnim, 
                            meta, 
                            componentList );
+      }
 
-         if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
+      if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
             addOutDetailTexCoord( componentList, 
                                   meta,
                                   useTexAnim );
-      }
 
       output = meta;
    }

Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp

@@ -225,10 +225,10 @@ void DeferredBumpFeatHLSL::processVert(   Vector<ShaderComponent*> &componentLis
       // We need the view to tangent space transform in the pixel shader.
       getOutViewToTangent( componentList, meta, fd );
 
+      const bool useTexAnim = fd.features[MFT_TexAnim];
       // Make sure there are texcoords
       if( !fd.features[MFT_Parallax] && !fd.features[MFT_DiffuseMap] )
       {
-         const bool useTexAnim = fd.features[MFT_TexAnim];
 
          getOutTexCoord(   "texCoord", 
                            "float2", 
@@ -236,12 +236,12 @@ void DeferredBumpFeatHLSL::processVert(   Vector<ShaderComponent*> &componentLis
                            useTexAnim, 
                            meta, 
                            componentList );
+      }
 
-         if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
+      if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
             addOutDetailTexCoord( componentList, 
                                   meta,
                                   useTexAnim );
-      }
 
       output = meta;
    }