diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-03-03 19:07:18 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-03-03 19:07:18 +0400 |
| commit | e80b0db58c30fa07544508abaa4f93d023f90d54 (patch) | |
| tree | 626dc943d4e8fbf3077271db8e9169a61ef0504b /intern/cycles | |
| parent | 4774357b594c5cd5a38b21df131b539a197c101b (diff) | |
Fix #34508: particle emitter show/hide option did not work correct after
recent bugfix.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 3472b067369..33546bfa25e 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -350,7 +350,7 @@ static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide hide = true; hide_triangles = (hair_present && !show_emitter); - return hide; + return hide && !show_emitter; } /* Object Loop */ |