[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33079] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#24724] Emission settings of Particles with no physics are stuck to Previous newtonian settings .
Janne Karhu
jhkarh at gmail.com
Mon Nov 15 10:15:23 CET 2010
Revision: 33079
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33079
Author: jhk
Date: 2010-11-15 10:15:23 +0100 (Mon, 15 Nov 2010)
Log Message:
-----------
Fix for [#24724] Emission settings of Particles with no physics are stuck to Previous newtonian settings.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/particle_system.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2010-11-15 09:14:43 UTC (rev 33078)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2010-11-15 09:15:23 UTC (rev 33079)
@@ -4083,7 +4083,7 @@
if(psys->recalc & PSYS_RECALC_RESET)
psys_reset(psys, PSYS_RESET_ALL);
- if(emit_particles(&sim, NULL, cfra)) {
+ if(emit_particles(&sim, NULL, cfra) || (psys->recalc & PSYS_RECALC_RESET)) {
free_keyed_keys(psys);
distribute_particles(&sim, part->from);
initialize_all_particles(&sim);
More information about the Bf-blender-cvs
mailing list