[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54993] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #34508: particle emitter show/ hide option did not work correct after

Brecht Van Lommel brechtvanlommel at pandora.be
Sun Mar 3 16:07:18 CET 2013


Revision: 54993
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54993
Author:   blendix
Date:     2013-03-03 15:07:18 +0000 (Sun, 03 Mar 2013)
Log Message:
-----------
Fix #34508: particle emitter show/hide option did not work correct after
recent bugfix.

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-03-03 13:53:32 UTC (rev 54992)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2013-03-03 15:07:18 UTC (rev 54993)
@@ -350,7 +350,7 @@
 			hide = true;
 
 	hide_triangles = (hair_present && !show_emitter);
-	return hide;
+	return hide && !show_emitter;
 }
 
 /* Object Loop */




More information about the Bf-blender-cvs mailing list