[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43085] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #29695: cycles particle emitter not being properly hidden.

[Brecht Van Lommel]

Revision: 43085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43085
Author:   blendix
Date:     2012-01-02 19:44:13 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Fix #29695: cycles particle emitter not being properly hidden.

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	2012-01-02 19:44:07 UTC (rev 43084)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2012-01-02 19:44:13 UTC (rev 43085)
@@ -234,13 +234,20 @@
 
 				object_free_duplilist(*b_ob);
 
-				/* check if we should render duplicator */
 				hide = true;
-				BL::Object::particle_systems_iterator b_psys;
+			}
 
-				for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys)
-					if(b_psys->settings().use_render_emitter())
-						hide = false;
+			/* check if we should render or hide particle emitter */
+			BL::Object::particle_systems_iterator b_psys;
+			bool render_emitter = false;
+
+			for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys) {
+				if(b_psys->settings().use_render_emitter()) {
+					hide = false;
+					render_emitter = true;
+				}
+				else if(!render_emitter)
+					hide = true;
 			}
 
 			if(!hide) {