diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2008-07-28 23:31:08 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2008-07-28 23:31:08 +0400 |
| commit | 565d1eee70c6b914496aeaa94d116379e9bb8d6f (patch) | |
| tree | 5b17f071bd2e3edb5e674c5e0bfd6d3f870b138c /source/gameengine | |
| parent | 74ba250afe3d4807a55c3d36e00c2d758a551f7c (diff) | |
branches/blender-2.47
Merge from trunk:
Revision: 15835
Revision: 15843
Diffstat (limited to 'source/gameengine')
| -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 82d16ffa181..a7a9deeb9d1 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -2041,7 +2041,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie, base = base->next; } - 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); kxscene->SetActiveCamera(gamecamera); |