diff options
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 2 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 9 | ||||
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 96a16e733d0..ded9b44afd4 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1610,7 +1610,7 @@ static int game_engine_exec(bContext *C, wmOperator *unused) game_set_commmandline_options(&startscene->gm); - if(rv3d->persp==RV3D_CAMOB && startscene->gm.framing.type == SCE_GAMEFRAMING_BARS) { /* Letterbox */ + if(rv3d->persp==RV3D_CAMOB && startscene->gm.framing.type == SCE_GAMEFRAMING_BARS && startscene->gm.stereoflag != STEREO_DOME) { /* Letterbox */ rctf cam_framef; calc_viewborder(startscene, ar, CTX_wm_view3d(C), &cam_framef); cam_frame.xmin = cam_framef.xmin + ar->winrct.xmin; diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 1ca4c43d6a6..61e298f173a 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -108,7 +108,7 @@ struct wmKeyMap *WM_keymap_copy_to_user(struct wmKeyMap *kemap){return (struct w struct wmKeyConfig *WM_keyconfig_add(struct wmWindowManager *wm, char *idname){return (struct wmKeyConfig *) NULL;} void WM_keymap_remove_item(struct wmKeyMap *keymap, struct wmKeyMapItem *kmi){} void WM_keymap_restore_to_default(struct wmKeyMap *keymap){} - +int WM_keymap_user_init(struct wmWindowManager *wm, struct wmKeyMap *keymap) {return 0;} /* rna editors */ @@ -270,10 +270,9 @@ void CSG_FreeVertexDescriptor(struct CSG_VertexIteratorDescriptor * v_descriptor int CSG_OutputFaceDescriptor(struct CSG_BooleanOperation * operation, struct CSG_FaceIteratorDescriptor * output){return 0;} int CSG_OutputVertexDescriptor(struct CSG_BooleanOperation * operation, struct CSG_VertexIteratorDescriptor *output){return 0;} - -typedef struct CSG_VertexIteratorDescriptor {int a;} CSG_VertexIteratorDescriptor; -typedef struct CSG_FaceIteratorDescriptor {int a;} CSG_FaceIteratorDescriptor; -typedef struct CSG_OperationType {int a;} CSG_OperationType; +typedef struct CSG_VertexIteratorDescriptor {int a;} CSG_VertexIteratorDescriptor; //workaround to build CSG_PerformanceBoolean Operation +typedef struct CSG_FaceIteratorDescriptor {int a;} CSG_FaceIteratorDescriptor; //workaround to build CSG_PerformanceBoolean Operation +typedef struct CSG_OperationType {int a;} CSG_OperationType; //workaround to build CSG_PerformanceBoolean Operation int CSG_PerformBooleanOperation( struct CSG_BooleanOperation *operation, diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index e599b89a2bb..6519626ee89 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -999,7 +999,7 @@ bool KX_BlenderSceneConverter::LinkBlendFile(const char *path, char *group, KX_S } if(GetMainDynamicPath(path)) { - snprintf(err_local, sizeof(err_local), "blend file alredy open \"%s\"\n", path); + snprintf(err_local, sizeof(err_local), "blend file already open \"%s\"\n", path); *err_str= err_local; return false; } |