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

[Janne Karhu]

Revision: 20101
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20101
Author:   jhk
Date:     2009-05-08 00:31:19 +0200 (Fri, 08 May 2009)

Log Message:
-----------
Second 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-07 22:06:27 UTC (rev 20100)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c    
2009-05-07 22:31:19 UTC (rev 20101)
@@ -203,8 +203,11 @@
                if(psys->particles->keys)
                        MEM_freeN(psys->particles->keys);
 
-               for(i=0, pa=psys->particles; i<totsaved; i++, pa++)
-                       if(pa->keys) pa->keys= NULL;
+               for(i=totsaved, pa=psys->particles+totsaved; i<psys->totpart; 
i++, pa++)
+                       if(pa->keys) {
+                               pa->keys= NULL;
+                               pa->totkey= 0;
+                       }
 
                for(i=totsaved, pa=psys->particles+totsaved; i<psys->totpart; 
i++, pa++)
                        if(pa->hair) MEM_freeN(pa->hair);


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