[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14513] trunk/blender/source/blender/src/ buttons_object.c:

[Brecht Van Lommel]

Revision: 14513
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14513
Author:   blendix
Date:     2008-04-22 12:08:00 +0200 (Tue, 22 Apr 2008)

Log Message:
-----------

Fix for bug #9491: cancelling bake didn't reset the simulation properly,
now it also keeps the already baked frames in the cache up to the point
is was cancelled.

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_object.c

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c   2008-04-22 07:40:04 UTC 
(rev 14512)
+++ trunk/blender/source/blender/src/buttons_object.c   2008-04-22 10:08:00 UTC 
(rev 14513)
@@ -2130,10 +2130,8 @@
                        BKE_ptcache_id_time(pid, 0.0f, &cstart, &cend, NULL);
 
                        cache->flag &= ~PTCACHE_BAKING;
-                       if(startframe == cstart)
-                               cache->flag &= ~PTCACHE_BAKED;
 
-                       BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_AFTER, 
startframe-1);
+                       BKE_ptcache_id_reset(pid, PTCACHE_RESET_OUTDATED);
                }
                else {
                        for(base=G.scene->base.first; base; base= base->next) {
@@ -2146,10 +2144,8 @@
                                                BKE_ptcache_id_time(pid, 0.0f, 
&cstart, &cend, NULL);
 
                                                cache->flag &= ~PTCACHE_BAKING;
-                                               if(startframe == cstart)
-                                                       cache->flag &= 
~PTCACHE_BAKED;
 
-                                               BKE_ptcache_id_clear(pid, 
PTCACHE_CLEAR_AFTER, startframe-1);
+                                               BKE_ptcache_id_reset(pid, 
PTCACHE_RESET_OUTDATED);
                                        }
 
                                        BLI_freelistN(&pidlist);


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