Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 31 insertions, 31 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl b/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl
index 3b9b8ae696..65476c24ff 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/dofCombineF.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file dofCombineF.glsl
  *
  * $LicenseInfo:firstyear=2007&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2007, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -42,34 +42,34 @@ in vec2 vary_fragcoord;
 
 vec4 dofSample(sampler2D tex, vec2 tc)
 {
-	tc.x = min(tc.x, dof_width);
-	tc.y = min(tc.y, dof_height);
+    tc.x = min(tc.x, dof_width);
+    tc.y = min(tc.y, dof_height);
 
-	return texture(tex, tc);
+    return texture(tex, tc);
 }
 
-void main() 
+void main()
 {
-	vec2 tc = vary_fragcoord.xy;
-	
-	vec4 dof = dofSample(diffuseRect, vary_fragcoord.xy*res_scale);
-	
-	vec4 diff = texture(lightMap, vary_fragcoord.xy);
-
-	float a = min(abs(diff.a*2.0-1.0) * max_cof*res_scale*res_scale, 1.0);
-
-	if (a > 0.25 && a < 0.75)
-	{ //help out the transition a bit
-		float sc = a/res_scale;
-		
-		vec4 col;
-		col = texture(lightMap, vary_fragcoord.xy+vec2(sc,sc)/screen_res);
-		col += texture(lightMap, vary_fragcoord.xy+vec2(-sc,sc)/screen_res);
-		col += texture(lightMap, vary_fragcoord.xy+vec2(sc,-sc)/screen_res);
-		col += texture(lightMap, vary_fragcoord.xy+vec2(-sc,-sc)/screen_res);
-		
-		diff = mix(diff, col*0.25, a);
-	}
-
-	frag_color = mix(diff, dof, a);
+    vec2 tc = vary_fragcoord.xy;
+
+    vec4 dof = dofSample(diffuseRect, vary_fragcoord.xy*res_scale);
+
+    vec4 diff = texture(lightMap, vary_fragcoord.xy);
+
+    float a = min(abs(diff.a*2.0-1.0) * max_cof*res_scale*res_scale, 1.0);
+
+    if (a > 0.25 && a < 0.75)
+    { //help out the transition a bit
+        float sc = a/res_scale;
+
+        vec4 col;
+        col = texture(lightMap, vary_fragcoord.xy+vec2(sc,sc)/screen_res);
+        col += texture(lightMap, vary_fragcoord.xy+vec2(-sc,sc)/screen_res);
+        col += texture(lightMap, vary_fragcoord.xy+vec2(sc,-sc)/screen_res);
+        col += texture(lightMap, vary_fragcoord.xy+vec2(-sc,-sc)/screen_res);
+
+        diff = mix(diff, col*0.25, a);
+    }
+
+    frag_color = mix(diff, dof, a);
 }