diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-28 18:35:56 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-28 18:35:56 +0400 |
| commit | 3131858792e9a99c19d698e092e2b975c1b3aec9 (patch) | |
| tree | bea8efa3a10818f75582562a1d12060e4668b36e /source/gameengine/Converter/BL_BlenderDataConversion.cpp | |
| parent | 42f957f910867e2a99f923cd458a1b65fe6d88a9 (diff) | |
svn merge -r15780:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) |