From ae3128b28b0a5f1ee8e7bbf027109c2a41f8a147 Mon Sep 17 00:00:00 2001
From: LuisAntonRebollo <souga_el_diablo_negro@hotmail.com>
Date: Sun, 8 Mar 2015 22:30:03 +0100
Subject: [PATCH] DeferredBumpFeat order of operations corrections. Clean.

---
 .../glsl/advancedLightingFeaturesGLSL.cpp     | 35 ++++++++++---------
 .../hlsl/advancedLightingFeaturesHLSL.cpp     |  9 ++---
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp
index fc8efa447..ce90bcc39 100644
--- a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp
+++ b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp
@@ -216,39 +216,40 @@ void DeferredRTLightingFeatGLSL::setTexData( Material::StageData &stageDat,
 void DeferredBumpFeatGLSL::processVert(   Vector<ShaderComponent*> &componentList, 
                                           const MaterialFeatureData &fd )
 {
-   if (fd.features[MFT_PrePassConditioner])
+   if( fd.features[MFT_PrePassConditioner] )
    {
       // There is an output conditioner active, so we need to supply a transform
       // to the pixel shader. 
       MultiLine *meta = new MultiLine;
 
       // We need the view to tangent space transform in the pixel shader.
-      getOutViewToTangent(componentList, meta, fd);
+      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])
+      if( !fd.features[MFT_Parallax] && !fd.features[MFT_DiffuseMap] )
       {
 
-         getOutTexCoord("texCoord",
-            "vec2",
-            true,
-            useTexAnim,
-            meta,
-            componentList);
+         getOutTexCoord(   "texCoord", 
+                           "vec2", 
+                           true, 
+                           useTexAnim, 
+                           meta, 
+                           componentList );
       }
-      if (fd.features.hasFeature(MFT_DetailNormalMap))
-         addOutDetailTexCoord(componentList,
-         meta,
-         useTexAnim);
+
+      if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
+            addOutDetailTexCoord( componentList, 
+                                  meta,
+                                  useTexAnim );
 
       output = meta;
    }
-   else if (fd.materialFeatures[MFT_NormalsOut] ||
-      fd.features[MFT_ForwardShading] ||
-      !fd.features[MFT_RTLighting])
+   else if (   fd.materialFeatures[MFT_NormalsOut] || 
+               fd.features[MFT_ForwardShading] || 
+               !fd.features[MFT_RTLighting] )
    {
-      Parent::processVert(componentList, fd);
+      Parent::processVert( componentList, fd );
       return;
    }
    else
diff --git a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp
index c6371caf2..deda7cbae 100644
--- a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp
+++ b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp
@@ -224,7 +224,7 @@ 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] )
@@ -237,10 +237,11 @@ void DeferredBumpFeatHLSL::processVert(   Vector<ShaderComponent*> &componentLis
                            meta, 
                            componentList );
       }
+
       if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
-         addOutDetailTexCoord( componentList, 
-                               meta,
-                               useTexAnim );
+            addOutDetailTexCoord( componentList, 
+                                  meta,
+                                  useTexAnim );
 
       output = meta;
    }