[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49590] trunk/blender/source/gameengine/ Physics/Bullet/CcdPhysicsEnvironment.cpp: Fix for [#32270] " Removing a Character object from the scene causes a crash." reported by me.

[Mitchell Stokes]

Revision: 49590
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49590
Author:   moguri
Date:     2012-08-05 22:31:55 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
Fix for [#32270] "Removing a Character object from the scene causes a crash." reported by me. The character's action wasn't being removed from the dynamics world when the character controller was.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2012-08-05 22:26:57 UTC (rev 49589)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2012-08-05 22:31:55 UTC (rev 49590)
@@ -451,6 +451,11 @@
 		} else
 		{
 			m_dynamicsWorld->removeCollisionObject(ctrl->GetCollisionObject());
+
+			if (ctrl->GetCharacterController())
+			{
+				m_dynamicsWorld->removeAction(ctrl->GetCharacterController());
+			}
 		}
 	}
 	if (ctrl->m_registerCount != 0)