From 795fa1f199a9e4489763502fd69e4e2f23ae2a9b Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Mon, 12 Aug 2013 06:53:17 +0000 Subject: Fix #36437 Cycles no longer rendering Emitter object (Particle Systems). The change r58999 was ignoring the "show_emitter" setting by particles (the result would be the same as long as hair was not used). If particle emitters are forced to show all other of the usual duplicator hiding should be disabled. --- intern/cycles/blender/blender_object.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index a5a2f1529a2..3410c73fbde 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -373,7 +373,7 @@ static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide if(show_emitter) { hide_triangles = false; - return (hide_as_dupli_parent || hide_as_dupli_child_original); + return false; } else if(hair_present) { hide_triangles = true; -- cgit v1.2.3