diff options
| author | graham linden <graham@lindenlab.com> | 2013-04-24 10:45:41 -0700 | 
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-04-24 10:45:41 -0700 | 
| commit | 6de39cec19265320c4b9f38e50e1a847d3dee5d2 (patch) | |
| tree | 86abb154a90c97132b232f75b63b23e225476596 | |
| parent | 339770698c0152d68d9b47ab73f8c6a5d9d8edfe (diff) | |
| parent | 4ae48c225b1bb82a5667757fea53ff5c0646a5c4 (diff) | |
Merged lindenlab/viewer-development-materials into default
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 11 | 
1 files changed, 8 insertions, 3 deletions
| diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index a8efd3e95b..77d02b36ff 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -182,18 +182,23 @@ void main()  	//vec4 color = calcLighting(pos.xyz, norm, diffuse_color, vec4(0.));  	vec4 col = vec4(0.0, 0.0, 0.0, diffuse_color.a); -	vary_pointlight_col = diffuse_color.rgb; +	vec3 diff = pow(diffuse_color.rgb, vec3(2.2)); + +	 + +	vary_pointlight_col = diff; +  	col.rgb = vec3(0,0,0);  	// Add windlight lights  	col.rgb = atmosAmbient(col.rgb); -	vary_ambient = col.rgb*diffuse_color.rgb; +	vary_ambient = col.rgb*diff.rgb;  	vary_directional.rgb = atmosAffectDirectionalLight(1.0f); -	col.rgb = col.rgb*diffuse_color.rgb; +	col.rgb = col.rgb*diff.rgb;  #ifdef USE_VERTEX_COLOR  	vertex_color = col; | 
