Fix #34508: particle emitter show/hide option did not work correct after

recent bugfix.
2013-03-03 15:07:18 +00:00 · 2013-03-03 15:07:18 +00:00 · e80b0db58c
commit e80b0db58c
parent 4774357b59
1 changed files with 1 additions and 1 deletions
--- 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 */