[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38790] trunk/blender/source/blender/gpu/ intern/gpu_material.c: Fix part of #27944: color managment discrepancy in GLSL materials with nodes.

[Brecht Van Lommel]

Revision: 38790
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38790
Author:   blendix
Date:     2011-07-28 14:28:27 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
Fix part of #27944: color managment discrepancy in GLSL materials with nodes.

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	2011-07-28 14:18:07 UTC (rev 38789)
+++ trunk/blender/source/blender/gpu/intern/gpu_material.c	2011-07-28 14:28:27 UTC (rev 38790)
@@ -1371,9 +1371,6 @@
 		mat->obcolalpha = 1;
 		GPU_link(mat, "shade_alpha_obcolor", shr->combined, GPU_builtin(GPU_OBCOLOR), &shr->combined);
 	}
-
-	if(gpu_do_color_management(mat))
-		GPU_link(mat, "linearrgb_to_srgb", shr->combined, &shr->combined);
 }
 
 static GPUNodeLink *GPU_blender_material(GPUMaterial *mat, Material *ma)
@@ -1408,6 +1405,10 @@
 		GPU_material_output_link(mat, outlink);
 	}
 
+	if(gpu_do_color_management(mat))
+		if(mat->outlink)
+			GPU_link(mat, "linearrgb_to_srgb", mat->outlink, &mat->outlink);
+
 	/*if(!GPU_material_construct_end(mat)) {
 		GPU_material_free(mat);
 		mat= NULL;