From 3131858792e9a99c19d698e092e2b975c1b3aec9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 28 Jul 2008 14:35:56 +0000 Subject: svn merge -r15780:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender --- source/gameengine/Converter/BL_BlenderDataConversion.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp') diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 9531c203640..1809e41b91c 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -2189,7 +2189,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie, } } - if (blenderscene->camera) { + // non-camera objects not supported as camera currently + if (blenderscene->camera && blenderscene->camera->type == OB_CAMERA) { KX_Camera *gamecamera= (KX_Camera*) converter->FindGameObject(blenderscene->camera); if(gamecamera) -- cgit v1.2.3