diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-27 14:26:53 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-27 14:26:53 -0500 |
| commit | d0b5a521f21ab8002fb5d9a4d11cee6c2385dbf3 (patch) | |
| tree | 4a56445866f63851cf02c5eb77cdcc1f7d463fc2 /indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl | |
| parent | 328cf0d1c71efa785b0f1201c27776a3a6d6a041 (diff) | |
SH-2244 Make emissive attribute match actual number of components coming in
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl index bf4c45f18f..8c38d5df2a 100644 --- a/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl @@ -28,7 +28,7 @@ uniform mat4 texture_matrix0; uniform mat4 modelview_matrix; ATTRIBUTE vec3 position; -ATTRIBUTE float emissive; +ATTRIBUTE vec4 emissive; ATTRIBUTE vec2 texcoord0; VARYING vec4 vertex_color; @@ -50,7 +50,7 @@ void main() calcAtmospherics(pos.xyz); - vertex_color = vec4(0,0,0,emissive); + vertex_color = emissive; gl_Position = projection_matrix*vec4(pos, 1.0); |