diff options
| author | Don Kjer <don@lindenlab.com> | 2012-05-29 20:41:10 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-05-29 20:41:10 +0000 |
| commit | 2d3790b2396534de096244bf7b7660ec5ec3a139 (patch) | |
| tree | 1cbe6616b0f1ef728370b73ad453857caf2eb53e /indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl | |
| parent | 2a62ca5b96d08ad2f24e8a60e161657a7222aba6 (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Merge ssh://hg@bitbucket.org/lindenlab/viewer-release -> viewer-eventapi-fixes
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl | 4 |
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 a95c9e0ab9..7c0699d72f 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 float texture_index; +ATTRIBUTE ivec4 texture_index; -VARYING float vary_texture_index; +VARYING_FLAT ivec4 vary_texture_index; void passTextureIndex() { |