summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-07-17 16:52:19 +0000
committerDon Kjer <don@lindenlab.com>2012-07-17 16:52:19 +0000
commitcff3469d46d297fbec34bc0d648588e900cd255c (patch)
treed768ddbc8712c9e81387ae4b03dd8227229a0fe1 /indra/newview/app_settings
parent5a473a42a63d3277c65bb3bc96e49f020508cfe8 (diff)
parent509408f393b8eb58799678adde801675a4d4d600 (diff)
Merge viewer-development -> viewer-horde-fixes
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl
index 7c0699d72f..ca29bf3143 100644
--- a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl
@@ -23,9 +23,9 @@
* $/LicenseInfo$
*/
-ATTRIBUTE ivec4 texture_index;
+ATTRIBUTE int texture_index;
-VARYING_FLAT ivec4 vary_texture_index;
+VARYING_FLAT int vary_texture_index;
void passTextureIndex()
{