[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38128] trunk/blender/source/blender/ blenkernel/intern/material.c: Fix #27777: vertex color disabled when in a reused node material.

[Brecht Van Lommel]

Revision: 38128
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38128
Author:   blendix
Date:     2011-07-05 19:45:26 +0000 (Tue, 05 Jul 2011)
Log Message:
-----------
Fix #27777: vertex color disabled when in a reused node material.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/material.c

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2011-07-05 19:10:28 UTC (rev 38127)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2011-07-05 19:45:26 UTC (rev 38128)
@@ -867,6 +867,10 @@
 
 	if(ma->strand_surfnor > 0.0f)
 		ma->mode_l |= MA_STR_SURFDIFF;
+
+	/* parses the geom+tex nodes */
+	if(ma->nodetree && ma->use_nodes)
+		ntreeShaderGetTexcoMode(ma->nodetree, r_mode, &ma->texco, &ma->mode_l);
 }
 
 static void init_render_nodetree(bNodeTree *ntree, Material *basemat, int r_mode, float *amb)
@@ -887,8 +891,6 @@
 				init_render_nodetree((bNodeTree *)node->id, basemat, r_mode, amb);
 		}
 	}
-	/* parses the geom+tex nodes */
-	ntreeShaderGetTexcoMode(ntree, r_mode, &basemat->texco, &basemat->mode_l);
 }
 
 void init_render_material(Material *mat, int r_mode, float *amb)