diff options
| author | graham linden <graham@lindenlab.com> | 2013-05-02 09:12:20 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-05-02 09:12:20 -0700 |
| commit | 33d22256663a074d6e7d9cb1b080b57202a06b05 (patch) | |
| tree | d926226beb28e0c94fc006fc708f419a328bede4 /indra/newview/app_settings/shaders/class1/objects | |
| parent | 91c618c8cdfdb57d18eeca4da7f7e986e6adb828 (diff) | |
| parent | 90c2be46bf677db00207a45478ade362b90d7a6c (diff) | |
Merged lindenlab/viewer-development-materials into default
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl b/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl index 3dab224258..9064904191 100755 --- a/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/emissiveSkinnedV.glsl @@ -48,6 +48,8 @@ void main() mat = modelview_matrix * mat; vec3 pos = (mat*vec4(position.xyz, 1.0)).xyz; + vertex_color = emissive; + calcAtmospherics(pos.xyz); gl_Position = projection_matrix*vec4(pos, 1.0); |