Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 22 insertions, 22 deletions

diff --git a/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl b/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
index e3fd10447e..7e1d906878 100644
--- a/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
+++ b/indra/newview/app_settings/shaders/class1/environment/srgbF.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file srgbF.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$
  */
@@ -27,37 +27,37 @@
 
 vec3 srgb_to_linear(vec3 cs)
 {
-	vec3 low_range = cs / vec3(12.92);
-	vec3 high_range = pow((cs+vec3(0.055))/vec3(1.055), vec3(2.4));
-	bvec3 lte = lessThanEqual(cs,vec3(0.04045));
+    vec3 low_range = cs / vec3(12.92);
+    vec3 high_range = pow((cs+vec3(0.055))/vec3(1.055), vec3(2.4));
+    bvec3 lte = lessThanEqual(cs,vec3(0.04045));
 
 #ifdef OLD_SELECT
-	vec3 result;
-	result.r = lte.r ? low_range.r : high_range.r;
-	result.g = lte.g ? low_range.g : high_range.g;
-	result.b = lte.b ? low_range.b : high_range.b;
+    vec3 result;
+    result.r = lte.r ? low_range.r : high_range.r;
+    result.g = lte.g ? low_range.g : high_range.g;
+    result.b = lte.b ? low_range.b : high_range.b;
     return result;
 #else
-	return mix(high_range, low_range, lte);
+    return mix(high_range, low_range, lte);
 #endif
 
 }
 
 vec3 linear_to_srgb(vec3 cl)
 {
-	cl = clamp(cl, vec3(0), vec3(1));
-	vec3 low_range  = cl * 12.92;
-	vec3 high_range = 1.055 * pow(cl, vec3(0.41666)) - 0.055;
-	bvec3 lt = lessThan(cl,vec3(0.0031308));
+    cl = clamp(cl, vec3(0), vec3(1));
+    vec3 low_range  = cl * 12.92;
+    vec3 high_range = 1.055 * pow(cl, vec3(0.41666)) - 0.055;
+    bvec3 lt = lessThan(cl,vec3(0.0031308));
 
 #ifdef OLD_SELECT
-	vec3 result;
-	result.r = lt.r ? low_range.r : high_range.r;
-	result.g = lt.g ? low_range.g : high_range.g;
-	result.b = lt.b ? low_range.b : high_range.b;
+    vec3 result;
+    result.r = lt.r ? low_range.r : high_range.r;
+    result.g = lt.g ? low_range.g : high_range.g;
+    result.b = lt.b ? low_range.b : high_range.b;
     return result;
 #else
-	return mix(high_range, low_range, lt);
+    return mix(high_range, low_range, lt);
 #endif
 
 }