[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47816] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #31780, cycles nested group rendering broken.

[Lukas Toenne]

Revision: 47816
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47816
Author:   lukastoenne
Date:     2012-06-13 08:10:59 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
Fix #31780, cycles nested group rendering broken. Was using the dupli object 'index' member to identify dupli objects, but this is not unique and in fact just 0 in most cases. Needs to use a simple dupli list counter instead.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_object.cpp

Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp	2012-06-13 08:00:56 UTC (rev 47815)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2012-06-13 08:10:59 UTC (rev 47816)
@@ -317,14 +317,18 @@
 					object_create_duplilist(*b_ob, b_scene);
 
 					BL::Object::dupli_list_iterator b_dup;
+					int b_index = 0;
+
 					for(b_ob->dupli_list.begin(b_dup); b_dup != b_ob->dupli_list.end(); ++b_dup) {
 						Transform tfm = get_transform(b_dup->matrix());
 						BL::Object b_dup_ob = b_dup->object();
 						bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
 
 						if(!(b_dup->hide() || dup_hide)) {
-							sync_object(*b_ob, b_dup->index(), b_dup_ob, tfm, ob_layer, motion, b_dup->particle_index() + particle_offset);
+							sync_object(*b_ob, b_index, b_dup_ob, tfm, ob_layer, motion, b_dup->particle_index() + particle_offset);
 						}
+						
+						++b_index;
 					}
 
 					object_free_duplilist(*b_ob);