[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50350] trunk/blender/source/blender/gpu/ intern/gpu_material.c: Fix for usage of un-initialized memory.

[Sergey Sharybin]

Revision: 50350
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50350
Author:   nazgul
Date:     2012-09-03 13:17:21 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Fix for usage of un-initialized memory.

Checked by Brecht when were in Blender Institute.

Discovered when was looking into #32296: Node Texture - Node Material - GLSL Viewport rendering issue

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-09-03 12:57:01 UTC (rev 50349)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c	2012-09-03 13:17:21 UTC (rev 50350)
@@ -1396,10 +1396,10 @@
 		GPU_material_enable_alpha(mat);
 
 	if ((mat->scene->gm.flag & GAME_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);
+		GPU_link(mat, "set_value", shi->alpha, &shr->alpha);
+		shr->combined = shr->diff;
 	}
 	else {
 		if (GPU_link_changed(shi->emit) || ma->emit != 0.0f) {
@@ -1418,8 +1418,9 @@
 		material_lights(shi, shr);
 
 		shr->combined = shr->diff;
-		shr->alpha = shi->alpha;
 
+		GPU_link(mat, "set_value", shi->alpha, &shr->alpha);
+
 		if (world) {
 			/* exposure correction */
 			if (world->exp!=0.0f || world->range!=1.0f) {