[Bf-blender-cvs] [f17a1bd] master: Fix T38388: Creating a new scene with full copy sets rigidbody collision shapes to box.

[Sergej Reich]

Commit: f17a1bd58b302c9be0fb89f9c147523080789805
Author: Sergej Reich
Date:   Wed Jan 29 15:02:45 2014 +0100
https://developer.blender.org/rBf17a1bd58b302c9be0fb89f9c147523080789805

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.

===================================================================

M       source/blender/blenkernel/intern/rigidbody.c

===================================================================

diff --git a/source/blender/blenkernel/intern/rigidbody.c 
b/source/blender/blenkernel/intern/rigidbody.c
index e78593c..216620c 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);

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