[Bf-blender-cvs] [7e5d2fe] master: Fix T37694: cycles particles emitter object rendering when it shouldn't.

[Brecht Van Lommel]

Commit: 7e5d2fee71849b5cd9568bd0056bf1c55f3b7fd7
Author: Brecht Van Lommel
Date:   Mon Dec 9 21:57:30 2013 +0100
http://developer.blender.org/rB7e5d2fee71849b5cd9568bd0056bf1c55f3b7fd7

Fix T37694: cycles particles emitter object rendering when it shouldn't.

This was broken by a recent bugfix for T37159.

===================================================================

M	intern/cycles/blender/blender_object.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 849ca96..0df8939 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -386,17 +386,16 @@ static bool object_render_hide(BL::Object b_ob, bool top_level, bool parent_hide
 		if(parent_hide)
 			hide_as_dupli_child_original = true;
 	
+	hide_triangles = hide_emitter;
+
 	if(show_emitter) {
-		hide_triangles = false;
 		return false;
 	}
 	else if(hair_present) {
-		hide_triangles = true;
-		return (hide_emitter || hide_as_dupli_child_original);
+		return hide_as_dupli_child_original;
 	}
 	else {
-		hide_triangles = false;
-		return (hide_emitter || hide_as_dupli_parent || hide_as_dupli_child_original);
+		return (hide_as_dupli_parent || hide_as_dupli_child_original);
 	}
 }