Merge commit 'e7eced3' into release/luau-scripting: whitespace fix.

1 files changed, 18 insertions, 18 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl
index 6b960fae33..d0fc362db9 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file class1\deferred\pbralphaV.glsl
  *
  * $LicenseInfo:firstyear=2022&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2022, 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$
  */
@@ -77,13 +77,13 @@ vec3 tangent_space_transform(vec4 vertex_tangent, vec3 vertex_normal, vec4[2] kh
 void main()
 {
 #ifdef HAS_SKIN
-	mat4 mat = getObjectSkinnedTransform();
-	mat = modelview_matrix * mat;
-	vec3 pos = (mat*vec4(position.xyz,1.0)).xyz;
-	vary_position = pos;
+    mat4 mat = getObjectSkinnedTransform();
+    mat = modelview_matrix * mat;
+    vec3 pos = (mat*vec4(position.xyz,1.0)).xyz;
+    vary_position = pos;
     vec4 vert = projection_matrix * vec4(pos,1.0);
 #else
-	//transform vertex
+    //transform vertex
     vec4 vert = modelview_projection_matrix * vec4(position.xyz, 1.0);
 #endif
     gl_Position = vert;
@@ -96,11 +96,11 @@ void main()
     emissive_texcoord = texture_transform(texcoord0, texture_emissive_transform, texture_matrix0);
 
 #ifdef HAS_SKIN
-	vec3 n = (mat*vec4(normal.xyz+position.xyz,1.0)).xyz-pos.xyz;
-	vec3 t = (mat*vec4(tangent.xyz+position.xyz,1.0)).xyz-pos.xyz;
+    vec3 n = (mat*vec4(normal.xyz+position.xyz,1.0)).xyz-pos.xyz;
+    vec3 t = (mat*vec4(tangent.xyz+position.xyz,1.0)).xyz-pos.xyz;
 #else //HAS_SKIN
-	vec3 n = normal_matrix * normal;
-  	vec3 t = normal_matrix * tangent.xyz;
+    vec3 n = normal_matrix * normal;
+    vec3 t = normal_matrix * tangent.xyz;
 #endif //HAS_SKIN
 
     n = normalize(n);
@@ -109,10 +109,10 @@ void main()
     vary_sign = tangent.w;
     vary_normal = n;
 
-	vertex_color = diffuse_color;
+    vertex_color = diffuse_color;
 
 #if !defined(HAS_SKIN)
-	vary_position = (modelview_matrix*vec4(position.xyz, 1.0)).xyz;
+    vary_position = (modelview_matrix*vec4(position.xyz, 1.0)).xyz;
 #endif
 }
 
@@ -145,7 +145,7 @@ vec2 texture_transform(vec2 vertex_texcoord, vec4[2] khr_gltf_transform, mat4 sl
 
 void main()
 {
-	//transform vertex
+    //transform vertex
     vec4 vert = modelview_projection_matrix * vec4(position.xyz, 1.0);
     gl_Position = vert;
     vary_position = vert.xyz;
@@ -153,7 +153,7 @@ void main()
     base_color_texcoord = texture_transform(texcoord0, texture_base_color_transform, texture_matrix0);
     emissive_texcoord = texture_transform(texcoord0, texture_emissive_transform, texture_matrix0);
 
-	vertex_color = diffuse_color;
+    vertex_color = diffuse_color;
 }
 
 #endif