[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52620] trunk/blender/intern/cycles/ blender/blender_object.cpp: Fix #33328: cycles not rendering dupliframes, needs an exception.

[Brecht Van Lommel]

Revision: 52620
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52620
Author:   blendix
Date:     2012-11-27 21:47:55 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Fix #33328: cycles not rendering dupliframes, needs an exception.

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-11-27 21:26:06 UTC (rev 52619)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp	2012-11-27 21:47:55 UTC (rev 52620)
@@ -360,8 +360,9 @@
 						bool emitter_hide = false;
 
 						if(b_dup_ob.is_duplicator()) {
-							/* duplicators hidden by default */
-							emitter_hide = true;
+							/* duplicators hidden by default, except dupliframes which duplicate self */
+							if(b_dup_ob.dupli_type() != BL::Object::dupli_type_FRAMES)
+								emitter_hide = true;
 							
 							/* check if we should render or hide particle emitter */
 							BL::Object::particle_systems_iterator b_psys;