Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev

merge maint-a (including maint-x) into gltf_development

1 files changed, 18 insertions, 18 deletions

diff --git a/indra/newview/app_settings/shaders/class1/interface/twotexturecompareF.glsl b/indra/newview/app_settings/shaders/class1/interface/twotexturecompareF.glsl
index 6d51b898b7..8477e8eb97 100644
--- a/indra/newview/app_settings/shaders/class1/interface/twotexturecompareF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/twotexturecompareF.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file twotexturecompareF.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$
  */
@@ -35,20 +35,20 @@ uniform float dither_scale_t;
 in vec2 vary_texcoord0;
 in vec2 vary_texcoord1;
 
-void main() 
+void main()
 {
-	frag_color = abs(texture(tex0, vary_texcoord0.xy) - texture(tex1, vary_texcoord0.xy));
+    frag_color = abs(texture(tex0, vary_texcoord0.xy) - texture(tex1, vary_texcoord0.xy));
 
-	vec2 dither_coord;
-	dither_coord[0] = vary_texcoord0[0] * dither_scale_s;
-	dither_coord[1] = vary_texcoord0[1] * dither_scale_t;
-	vec4 dither_vec = texture(dither_tex, dither_coord.xy);
+    vec2 dither_coord;
+    dither_coord[0] = vary_texcoord0[0] * dither_scale_s;
+    dither_coord[1] = vary_texcoord0[1] * dither_scale_t;
+    vec4 dither_vec = texture(dither_tex, dither_coord.xy);
 
-	for(int i = 0; i < 3; i++)
-	{
-		if(frag_color[i] < dither_vec[i] * dither_scale)
-		{
-			frag_color[i] = 0.f;
-		}
-	}
+    for(int i = 0; i < 3; i++)
+    {
+        if(frag_color[i] < dither_vec[i] * dither_scale)
+        {
+            frag_color[i] = 0.f;
+        }
+    }
 }