[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61174] trunk/blender/source/gameengine/ Physics/Bullet/CcdPhysicsEnvironment.cpp: BGE: Fix for #37335 " Moving the camera with a key (after the recent BGE cleanup commits) now crashes the game" reported by Ace Dragon.

[Mitchell Stokes]

Revision: 61174
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61174
Author:   moguri
Date:     2013-11-06 19:40:37 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
BGE: Fix for #37335 "Moving the camera with a key (after the recent BGE cleanup commits) now crashes the game" reported by Ace Dragon.

CcdPhysicsEnvironment->GetCharacterController(); was missing a NULL check.

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	2013-11-06 19:21:42 UTC (rev 61173)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2013-11-06 19:40:37 UTC (rev 61174)
@@ -2288,7 +2288,7 @@
 PHY_ICharacter* CcdPhysicsEnvironment::GetCharacterController(KX_GameObject *ob)
 {
 	CcdPhysicsController* controller = (CcdPhysicsController*)ob->GetPhysicsController();
-	return dynamic_cast<BlenderBulletCharacterController*>(controller->GetCharacterController());
+	return (controller) ? dynamic_cast<BlenderBulletCharacterController*>(controller->GetCharacterController()) : NULL;
 }