archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #35077: cycles incorrectly rendered an empty with dupligroup that was

Browse Source 
dupliverted by its parent.
This commit is contained in:
Brecht Van Lommel
2013-04-25 14:16:24 +00:00
parent c2d5c72245
commit 811587ce32
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/blender/blender_object.cpp
View File

@@ -353,6 +353,13 @@ static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide
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 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
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);