[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49570] trunk/blender/source/gameengine/ Ketsji/KX_Scene.cpp: BGE: Fixing a NULL pointer exception caused by calling KX_Scene. active_camera when there is no camera in the scene.

[Mitchell Stokes]

Revision: 49570
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49570
Author:   moguri
Date:     2012-08-05 07:01:08 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
BGE: Fixing a NULL pointer exception caused by calling KX_Scene.active_camera 
when there is no camera in the scene.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2012-08-05 02:34:31 UTC 
(rev 49569)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2012-08-05 07:01:08 UTC 
(rev 49570)
@@ -2164,7 +2164,11 @@
 PyObject* KX_Scene::pyattr_get_active_camera(void *self_v, const 
KX_PYATTRIBUTE_DEF *attrdef)
 {
        KX_Scene* self= static_cast<KX_Scene*>(self_v);
-       return self->GetActiveCamera()->GetProxy();
+       KX_Camera* cam= self->GetActiveCamera();
+       if (cam)
+               return self->GetActiveCamera()->GetProxy();
+       else
+               Py_RETURN_NONE;
 }
 
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs