[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56294] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #35077: cycles incorrectly rendered an empty with dupligroup that was

[Brecht Van Lommel]

Revision: 56294
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56294
Author:   blendix
Date:     2013-04-25 14:16:24 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
Fix #35077: cycles incorrectly rendered an empty with dupligroup that was
dupliverted by its parent.

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	2013-04-25 14:16:22 UTC (rev 56293)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2013-04-25 14:16:24 UTC (rev 56294)
@@ -353,6 +353,13 @@
 	return hide && !show_emitter;
 }
 
+static bool object_render_hide_duplis(BL::Object b_ob)
+{
+	BL::Object parent = b_ob.parent();
+
+	return (parent && object_render_hide_original(parent.dupli_type()));
+}
+
 /* Object Loop */
 
 void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
@@ -387,7 +394,7 @@
 			if(!hide) {
 				progress.set_sync_status("Synchronizing object", (*b_ob).name());
 
-				if(b_ob->is_duplicator()) {
+				if(b_ob->is_duplicator() && !object_render_hide_duplis(*b_ob)) {
 					/* dupli objects */
 					b_ob->dupli_list_create(b_scene, 2);