diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-10 00:57:30 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-10 00:59:45 +0400 |
commit | 7e5d2fee71849b5cd9568bd0056bf1c55f3b7fd7 (patch) | |
tree | 99c28c46229468b68a189aba2a437499a4d5709d /intern | |
parent | f0675b14d84392e65c9e746752defa707335626c (diff) |
Fix T37694: cycles particles emitter object rendering when it shouldn't.
This was broken by a recent bugfix for T37159.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/blender_object.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 849ca963de6..0df8939bc18 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -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); } } |