[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20082] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Fix for [#18697] 2.49RC1: Keyed Particles fine in viewport but give me a crash during render

[Janne Karhu]

Revision: 20082
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20082
Author:   jhk
Date:     2009-05-06 10:33:40 +0200 (Wed, 06 May 2009)

Log Message:
-----------
Fix for [#18697] 2.49RC1: Keyed Particles fine in viewport but give me a crash 
during render

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    
2009-05-06 06:01:09 UTC (rev 20081)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c    
2009-05-06 08:33:40 UTC (rev 20082)
@@ -2007,7 +2007,6 @@
        Object *kob = ob;
        ParticleSystem *kpsys = psys;
        ParticleData *pa;
-       ParticleKey state;
        int totpart = psys->totpart, i, k, totkeys = psys->totkeyed + 1;
        float prevtime, nexttime, keyedtime;
 
@@ -2031,10 +2030,11 @@
        }
        
        psys->flag &= ~PSYS_KEYED;
-       state.time=-1.0;
 
        for(k=0; k<totkeys; k++) {
                for(i=0,pa=psys->particles; i<totpart; i++, pa++) {
+                       (pa->keys + k)->time = -1.0; /* use current time */
+
                        if(kpsys->totpart > 0)
                                psys_get_particle_state(kob, kpsys, 
i%kpsys->totpart, pa->keys + k, 1);
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs