[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59076] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #36437 Cycles no longer rendering Emitter object (Particle Systems).

[Lukas Toenne]

Revision: 59076
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59076
Author:   lukastoenne
Date:     2013-08-12 06:53:17 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
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.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58999

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_object.cpp

Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp	2013-08-12 06:10:29 UTC (rev 59075)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2013-08-12 06:53:17 UTC (rev 59076)
@@ -373,7 +373,7 @@
 	
 	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;