Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergej Reich <sergej.reich@googlemail.com>2013-02-20 00:04:08 +0400
committerSergej Reich <sergej.reich@googlemail.com>2013-02-20 00:04:08 +0400
commit3e5f6293b6f73531d9765c0156ec762470a44fc2 (patch)
treefaa634965b75b5c002fdac2ee208ae74472e8fb5 /source/blender/blenkernel/intern/rigidbody.c
parent3d415325542730b610be0d1337c0f5ba13189e9c (diff)
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).
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
-rw-r--r--source/blender/blenkernel/intern/rigidbody.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 66edfe2fe15..caa344f862e 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1259,7 +1259,7 @@ void BKE_rigidbody_do_simulation(Scene *scene, float ctime)
}
/* 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);