diff options
author | Dave Parks <davep@lindenlab.com> | 2013-05-01 16:43:08 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2013-05-01 16:43:08 -0500 |
commit | 5534078e9d371782148f08e40ca55bf0b52aa512 (patch) | |
tree | 461ee16edd0d6d0700ff1e945356258c8aa67f80 /indra/newview/app_settings/shaders/class1/objects | |
parent | d7877e078e9b3488ad92617afada19d2e4828aea (diff) | |
parent | 0938ce04f7d12439740285b61db3dd0bdadebb4f (diff) |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl | 4 |
1 files changed, 0 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..3dab224258 100644 --- a/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl @@ -50,9 +50,5 @@ void main() calcAtmospherics(pos.xyz); - vertex_color = emissive; - gl_Position = projection_matrix*vec4(pos, 1.0); - - } |