[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51479] trunk/blender/source/blender/ render/intern/source/convertblender.c: Bugfix #27504

[Ton Roosendaal]

Revision: 51479
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51479
Author:   ton
Date:     2012-10-21 13:30:18 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
Bugfix #27504

Render error.
Particle systems that duplicate group instances were setting the wrong
layer to the instanced objects, the correct layer is the particle system
itself - as being shown in the viewport correctly already.

Old report from May 2011 :)

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2012-10-21 12:35:01 UTC (rev 51478)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2012-10-21 13:30:18 UTC (rev 51479)
@@ -4935,7 +4935,8 @@
 						 * a dupligroup that has already been created before */
 						if (dob->type != OB_DUPLIGROUP || (obr=find_dupligroup_dupli(re, obd, 0))) {
 							mult_m4_m4m4(mat, re->viewmat, dob->mat);
-							obi= RE_addRenderInstance(re, NULL, obd, ob, dob->index, 0, mat, obd->lay);
+														/* ob = particle system, use that layer */
+							obi= RE_addRenderInstance(re, NULL, obd, ob, dob->index, 0, mat, ob->lay); 
 
 							/* fill in instance variables for texturing */
 							set_dupli_tex_mat(re, obi, dob);