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

Fix T37694: cycles particles emitter object rendering when it shouldn't.

Browse Source 
This was broken by a recent bugfix for T37159.
This commit is contained in:
Brecht Van Lommel
2013-12-09 21:57:30 +01:00
parent f0675b14d8
commit 7e5d2fee71
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -386,17 +386,16 @@ static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide
if(parent_hide)
hide_as_dupli_child_original = true;
hide_triangles = hide_emitter;
if(show_emitter) {
hide_triangles = false;
return false;
}
else if(hair_present) {
hide_triangles = true;
return (hide_emitter || hide_as_dupli_child_original);
return hide_as_dupli_child_original;
}
else {
hide_triangles = false;
return (hide_emitter || hide_as_dupli_parent || hide_as_dupli_child_original);
return (hide_as_dupli_parent || hide_as_dupli_child_original);
}
}