Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T37159: cycles rendering particle emitter mesh incorrectly when using non-hair particles.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-11-27 17:14:53 +01:00
parent 12b4a67e95
commit f67dda6893
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,6 +357,7 @@ static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide
bool hair_present = false; bool hair_present = false;
bool show_emitter = false; bool show_emitter = false;
bool hide_emitter = false;
bool hide_as_dupli_parent = false; bool hide_as_dupli_parent = false;
bool hide_as_dupli_child_original = false; bool hide_as_dupli_child_original = false;
@@ -367,8 +368,13 @@ static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide
if(b_psys->settings().use_render_emitter()) if(b_psys->settings().use_render_emitter())
show_emitter = true; show_emitter = true;
else
hide_emitter = true;
} }
if(show_emitter)
hide_emitter = false;
/* duplicators hidden by default, except dupliframes which duplicate self */ /* duplicators hidden by default, except dupliframes which duplicate self */
if(b_ob.is_duplicator()) if(b_ob.is_duplicator())
if(top_level || b_ob.dupli_type() != BL::Object::dupli_type_FRAMES) if(top_level || b_ob.dupli_type() != BL::Object::dupli_type_FRAMES)
@@ -386,11 +392,11 @@ static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide
} }
else if(hair_present) { else if(hair_present) {
hide_triangles = true; hide_triangles = true;
return hide_as_dupli_child_original; return (hide_emitter || hide_as_dupli_child_original);
} }
else { else {
hide_triangles = false; hide_triangles = false;
return (hide_as_dupli_parent || hide_as_dupli_child_original); return (hide_emitter || hide_as_dupli_parent || hide_as_dupli_child_original);
} }
} }