diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-10-23 17:31:44 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-10-23 17:31:44 -0500 |
| commit | 9b8cd0e923440d6c37f9b97aef29edec6ac09dbc (patch) | |
| tree | d7ab7171cf378d77943933fe1b3d9523c885ce6c | |
| parent | 8039c4583e68b7090fffea28b388fffd61d4b443 (diff) | |
MAINT-1579 Fix for diffuse color being ignored in mesh import preview render.
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/previewV.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl index f2db314201..da3387e7a5 100644 --- a/indra/newview/app_settings/shaders/class1/objects/previewV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/previewV.glsl @@ -61,5 +61,5 @@ void main() col.rgb += light_diffuse[2].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[2], light_direction[2], light_attenuation[2].x, light_attenuation[2].z); col.rgb += light_diffuse[3].rgb*calcPointLightOrSpotLight(pos.xyz, norm, light_position[3], light_direction[3], light_attenuation[3].x, light_attenuation[3].z); - vertex_color = col; + vertex_color = col*color; } |