diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-02-17 23:38:08 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-02-17 23:38:08 +0400 |
| commit | 3e0725854c091c48695bf89da66e927aad611574 (patch) | |
| tree | c7fd10c4bf1a0706b426d3059185ec91c67f80eb /source/blender/blenkernel/intern/object.c | |
| parent | 029686a2fd7819ef0047dc4dc566d4f08d647624 (diff) | |
rigidbody: Fix regression in background scene fix
Since BKE_object_where_is_calc() might be called outside of
scene_update_tagged_recursive(), we need to fall back to the scene's
rigid body world.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index b810aa89257..58b47398a7d 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2145,6 +2145,8 @@ void BKE_object_where_is_calc_time_ex(Scene *scene, Object *ob, float ctime, BKE_object_to_mat4(ob, ob->obmat); } + /* try to fall back to the scene rigid body world if none given */ + rbw = rbw ? rbw : scene->rigidbody_world; /* read values pushed into RBO from sim/cache... */ BKE_rigidbody_sync_transforms(rbw, ob, ctime); |