diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2014-01-29 18:02:45 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2014-01-29 18:03:41 +0400 |
| commit | f17a1bd58b302c9be0fb89f9c147523080789805 (patch) | |
| tree | 63b8eee1c6a29f5c96104e710d8044932574679a /source/blender/blenkernel/intern/rigidbody.c | |
| parent | 44cb138cf20e6c874d84a2ba7cf4858fdfbfe9c8 (diff) | |
Fix T38388: Creating a new scene with full copy sets rigidbody collision shapes to box.
Tweak world rebuilding logic, so it's not done before object data was
updated.
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index e78593c7142..216620c351d 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -1307,7 +1307,7 @@ void BKE_rigidbody_rebuild_world(Scene *scene, float ctime) cache->flag |= PTCACHE_OUTDATED; } - if (ctime <= startframe + 1 && rbw->ltime == startframe) { + if (ctime == startframe + 1 && rbw->ltime == startframe) { if (cache->flag & PTCACHE_OUTDATED) { BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED); rigidbody_update_simulation(scene, rbw, true); |