[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54676] trunk/blender/source/blender/ blenkernel/intern/rigidbody.c: rigidbody: Don' t run simulation if cache is baked

Sergej Reich sergej.reich at googlemail.com
Tue Feb 19 21:04:10 CET 2013


Revision: 54676
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54676
Author:   sergof
Date:     2013-02-19 20:04:08 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
rigidbody: Don't run simulation if cache is baked

In rare cases this would allow the simulation to run before being
initialized (if cache is baked and reading cache fails after undo or
loading a file).

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/rigidbody.c

Modified: trunk/blender/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-02-19 16:57:04 UTC (rev 54675)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-02-19 20:04:08 UTC (rev 54676)
@@ -1259,7 +1259,7 @@
 	}
 
 	/* advance simulation, we can only step one frame forward */
-	if (ctime == rbw->ltime + 1) {
+	if (ctime == rbw->ltime + 1 && !(cache->flag & PTCACHE_BAKED)) {
 		/* write cache for first frame when on second frame */
 		if (rbw->ltime == startframe && (cache->flag & PTCACHE_OUTDATED || cache->last_exact == 0)) {
 			BKE_ptcache_write(&pid, startframe);




More information about the Bf-blender-cvs mailing list