diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2012-08-05 11:01:08 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2012-08-05 11:01:08 +0400 |
| commit | a71fcd6a136b48218ba2ff2d69bf18bfa4f2b237 (patch) | |
| tree | b2ec24984dc7dbcb20769f242ebc65898f1b9cda /source/gameengine/Ketsji/KX_Scene.cpp | |
| parent | 909034017525b0ee17fac3181b111782e70e88f6 (diff) | |
BGE: Fixing a NULL pointer exception caused by calling KX_Scene.active_camera when there is no camera in the scene.
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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<KX_Scene*>(self_v); - return self->GetActiveCamera()->GetProxy(); + KX_Camera* cam= self->GetActiveCamera(); + if (cam) + return self->GetActiveCamera()->GetProxy(); + else + Py_RETURN_NONE; } |