diff options
| author | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:31:48 -0600 |
|---|---|---|
| committer | Cinder Roxley <cinder.roxley@phoenixviewer.com> | 2013-06-27 21:31:48 -0600 |
| commit | 97ed20a12bc5b0c0a14534970146425bc854d7fb (patch) | |
| tree | 7071c3750cf0b32c12c0fe32cfaecddcfa6da4f0 /indra/newview/app_settings/shaders/class1/objects | |
| parent | 4cf16ffdfbb166fbb3fcf1d7950ca1a240c94ca1 (diff) | |
| parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl index 8494ffba52..9064904191 100755 --- a/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl @@ -48,11 +48,9 @@ void main() mat = modelview_matrix * mat; vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz; + vertex_color = emissive; + calcAtmospherics(pos.xyz); - vertex_color = emissive; - gl_Position = projection_matrix*vec4(pos, 1.0); - - } |