[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16922] trunk/blender/source/blender/gpu/ intern/gpu_material.c: Fix wrong result for GLSL material node with only diffuse output

Brecht Van Lommel brecht at blender.org
Sat Oct 4 22:22:43 CEST 2008


Revision: 16922
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16922
Author:   blendix
Date:     2008-10-04 22:22:43 +0200 (Sat, 04 Oct 2008)

Log Message:
-----------
Fix wrong result for GLSL material node with only diffuse output
and shadeless material.

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	2008-10-04 19:58:08 UTC (rev 16921)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c	2008-10-04 20:22:43 UTC (rev 16922)
@@ -1145,6 +1145,8 @@
 	if((G.fileflags & G_FILE_GLSL_NO_LIGHTS) || (ma->mode & MA_SHLESS)) {
 		shr->combined = shi->rgb;
 		shr->alpha = shi->alpha;
+		GPU_link(mat, "set_rgb", shi->rgb, &shr->diff);
+		GPU_link(mat, "set_rgb_zero", &shr->spec);
 	}
 	else {
 		if(GPU_link_changed(shi->emit) || ma->emit != 0.0f) {





More information about the Bf-blender-cvs mailing list