[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48999] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: fix for particle system using uninitialized stack memory with midpoint of rk4 integrators .
Campbell Barton
ideasman42 at gmail.com
Tue Jul 17 15:28:31 CEST 2012
Revision: 48999
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48999
Author: campbellbarton
Date: 2012-07-17 13:28:30 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
fix for particle system using uninitialized stack memory with midpoint of rk4 integrators.
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 2012-07-17 12:05:15 UTC (rev 48998)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-07-17 13:28:30 UTC (rev 48999)
@@ -2159,7 +2159,9 @@
break;
}
- copy_particle_key(states, &pa->state, 1);
+ for (i=0; i<steps; i++) {
+ copy_particle_key(states + i, &pa->state, 1);
+ }
states->time = 0.f;
@@ -2739,7 +2741,12 @@
return;
}
- extrotfac = len_v3(pa->state.ave);
+ if (part->flag & PART_ROT_DYN) {
+ extrotfac = len_v3(pa->state.ave);
+ }
+ else {
+ extrotfac = 0.0f;
+ }
if ((part->flag & PART_ROT_DYN) && ELEM3(part->avemode, PART_AVE_VELOCITY, PART_AVE_HORIZONTAL, PART_AVE_VERTICAL)) {
float angle;
More information about the Bf-blender-cvs
mailing list