sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bge: fix for "dome mode not working with Letterboxing".

Browse Source 
This bug was introduced after commit # 24102 (BGE: when letterbox is enabled use the camera framing as a clipping area) reported in IRC by Pete Carss (domejunky)

*) an extra stub fix for recent commit. By the way: we want to have blenderplayer running in blender 2.5 beta0. Therefore if you are doing big changes in the last minutes (Friday, Saturday??) It would help a lot if you could enable blenderplayer in your builds. links problems are really easy to fix)

**) an typo I spotted in recent mesh dynamic load in bge.
This commit is contained in:
Dalai Felinto 2009-11-16 02:52:02 +00:00
parent aa739e7a71
commit 2e104b44c6
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_view3d/view3d_view.c
View File

@ -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;

9
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@ -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,

2
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
View File

@ -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;
}