[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54617] trunk/blender/source/blender/ blenkernel/intern/object.c: rigidbody: Fix regression in background scene fix

[Sergej Reich]

Revision: 54617
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54617
Author:   sergof
Date:     2013-02-17 19:38:08 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
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.

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

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2013-02-17 18:46:50 UTC (rev 54616)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2013-02-17 19:38:08 UTC (rev 54617)
@@ -2145,6 +2145,8 @@
 		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);