[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60421] trunk/blender/source/blender/ blenkernel/intern/rigidbody.c: Fix [#36847] If Force Field in Ridgid Body group, crash at first frame of animation on playback

[Bastien Montagne]

Revision: 60421
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60421
Author:   mont29
Date:     2013-09-29 13:38:56 +0000 (Sun, 29 Sep 2013)
Log Message:
-----------
Fix [#36847] If Force Field in Ridgid Body group, crash at first frame of animation on playback

Not all objects in RB group actually have a "rigid body object", needs to be checked.

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

Modified: trunk/blender/source/blender/blenkernel/intern/rigidbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-09-29 13:25:42 UTC (rev 60420)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-09-29 13:38:56 UTC (rev 60421)
@@ -1166,7 +1166,7 @@
 		if (ob) {
 			RigidBodyOb *rbo = ob->rigidbody_object;
 			/* reset kinematic state for transformed objects */
-			if (ob->flag & SELECT && G.moving & G_TRANSFORM_OBJ) {
+			if (rbo && (ob->flag & SELECT) && (G.moving & G_TRANSFORM_OBJ)) {
 				RB_body_set_kinematic_state(rbo->physics_object, rbo->flag & RBO_FLAG_KINEMATIC || rbo->flag & RBO_FLAG_DISABLED);
 				RB_body_set_mass(rbo->physics_object, RBO_GET_MASS(rbo));
 				/* deactivate passive objects so they don't interfere with deactivation of active objects */