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.
This commit is contained in:
Lukas Toenne
2013-08-12 06:53:17 +00:00
parent 68c8530be1
commit 795fa1f199

View File

@@ -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;