[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46821] trunk/blender/source/blender/gpu/ intern/gpu_material.c: Fix #31511: GLSL preview is much darker than F12 results

[Daniel Stokes]

Revision: 46821
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46821
Author:   kupoman
Date:     2012-05-20 21:19:55 +0000 (Sun, 20 May 2012)
Log Message:
-----------
Fix #31511: GLSL preview is much darker than F12 results

A problem caused by Harmony branch code. A value was being set improperly for the GLSL shader.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_material.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_material.c	2012-05-20 21:00:33 UTC (rev 46820)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c	2012-05-20 21:19:55 UTC (rev 46821)
@@ -708,7 +708,7 @@
 	i = is;
 	GPU_link(mat, "shade_visifac", i, visifac, shi->refl, &i);
 	
-	GPU_link(mat, "shade_mul_value", i, GPU_dynamic_uniform(lamp->dyncol, GPU_DYNAMIC_LAMP_DYNCOL, lamp->ob), &lcol);
+	GPU_link(mat, "set_value", GPU_dynamic_uniform(lamp->dyncol, GPU_DYNAMIC_LAMP_DYNCOL, lamp->ob), &lcol);
 	shade_light_textures(mat, lamp, &lcol);
 
 #if 0