diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-24 07:41:30 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-24 07:41:30 -0700 |
| commit | 339770698c0152d68d9b47ab73f8c6a5d9d8edfe (patch) | |
| tree | a9269949595ac8765483c3305907e527c0ac2494 /indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | |
| parent | b2cd1144713e4e1bbf77edf6547f633be55ab8ea (diff) | |
| parent | 79318043218a9ec6cb6e52eca936487177554903 (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index 20042f2248..a8efd3e95b 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -161,7 +161,7 @@ void main() pos = (modelview_matrix * vert); gl_Position = modelview_projection_matrix*vec4(position.xyz, 1.0); #endif - + #endif #ifdef USE_INDEXED_TEX @@ -194,7 +194,7 @@ void main() vary_directional.rgb = atmosAffectDirectionalLight(1.0f); col.rgb = col.rgb*diffuse_color.rgb; - + #ifdef USE_VERTEX_COLOR vertex_color = col; #endif |