From a71fcd6a136b48218ba2ff2d69bf18bfa4f2b237 Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Sun, 5 Aug 2012 07:01:08 +0000 Subject: [PATCH] BGE: Fixing a NULL pointer exception caused by calling KX_Scene.active_camera when there is no camera in the scene. --- source/gameengine/Ketsji/KX_Scene.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index e09d5f13bfe..5d4b9ae40c2 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -2164,7 +2164,11 @@ PyObject* KX_Scene::pyattr_get_cameras(void *self_v, const KX_PYATTRIBUTE_DEF *a PyObject* KX_Scene::pyattr_get_active_camera(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef) { KX_Scene* self= static_cast(self_v); - return self->GetActiveCamera()->GetProxy(); + KX_Camera* cam= self->GetActiveCamera(); + if (cam) + return self->GetActiveCamera()->GetProxy(); + else + Py_RETURN_NONE; }