[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50306] trunk/blender/intern/cycles/render /particles.cpp: Cycles fix: don' t skip particle device update when there are no particle systems.

Lukas Toenne lukas.toenne at googlemail.com
Sat Sep 1 13:30:20 CEST 2012


Revision: 50306
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50306
Author:   lukastoenne
Date:     2012-09-01 11:30:19 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
Cycles fix: don't skip particle device update when there are no particle systems. The device texture always contains at least one dummy particle in case particle info node is used for non-instance objects, this must be initialized in any case.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/particles.cpp

Modified: trunk/blender/intern/cycles/render/particles.cpp
===================================================================
--- trunk/blender/intern/cycles/render/particles.cpp	2012-09-01 02:49:06 UTC (rev 50305)
+++ trunk/blender/intern/cycles/render/particles.cpp	2012-09-01 11:30:19 UTC (rev 50306)
@@ -100,9 +100,6 @@
 	
 	device_free(device, dscene);
 
-	if(scene->particle_systems.size() == 0)
-		return;
-
 	progress.set_status("Updating Particle Systems", "Copying Particles to device");
 	device_update_particles(device, dscene, scene, progress);
 	




More information about the Bf-blender-cvs mailing list