[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54307] trunk/blender/source/blender/ blenkernel/intern/rigidbody.c: rigidbody: Fix [#34106] Deleting an object with Bullet Constraint crashes Blender

Sergej Reich sergej.reich at googlemail.com
Tue Feb 5 00:50:32 CET 2013


Revision: 54307
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54307
Author:   sergof
Date:     2013-02-04 23:50:31 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
rigidbody: Fix [#34106] Deleting an object with Bullet Constraint crashes Blender

Constraints are deleted before rigid bodies so need to check if constraint
exists in case both the constraint and ridid body are on the same object.

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-02-04 19:12:17 UTC (rev 54306)
+++ trunk/blender/source/blender/blenkernel/intern/rigidbody.c	2013-02-04 23:50:31 UTC (rev 54307)
@@ -853,7 +853,7 @@
 		if (rbw->constraints) {
 			for (go = rbw->constraints->gobject.first; go; go = go->next) {
 				Object *obt = go->ob;
-				if (obt) {
+				if (obt && obt->rigidbody_constraint) {
 					rbc = obt->rigidbody_constraint;
 					if (rbc->ob1 == ob) {
 						rbc->ob1 = NULL;




More information about the Bf-blender-cvs mailing list