diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_stereo.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_stereo.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index ab6da2cc947..fb9c71163c8 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -70,7 +70,7 @@ void wm_stereo3d_draw_sidebyside(wmWindow *win, int view) soffx = 0; } } - else { // RIGHT_LEFT_ID + else { /* #RIGHT_LEFT_ID */ if (cross_eyed) { soffx = 0; } @@ -262,10 +262,10 @@ static bool wm_stereo3d_set_properties(bContext *UNUSED(C), wmOperator *op) static void wm_stereo3d_set_init(bContext *C, wmOperator *op) { - Stereo3dData *s3dd; wmWindow *win = CTX_wm_window(C); - op->customdata = s3dd = MEM_callocN(sizeof(Stereo3dData), __func__); + Stereo3dData *s3dd = MEM_callocN(sizeof(Stereo3dData), __func__); + op->customdata = s3dd; /* store the original win stereo 3d settings in case of cancel */ s3dd->stereo3d_format = *win->stereo3d_format; @@ -278,7 +278,6 @@ int wm_stereo3d_set_exec(bContext *C, wmOperator *op) wmWindow *win_dst = NULL; const bool is_fullscreen = WM_window_is_fullscreen(win_src); char prev_display_mode = win_src->stereo3d_format->display_mode; - Stereo3dData *s3dd; bool ok = true; if (G.background) { @@ -291,7 +290,7 @@ int wm_stereo3d_set_exec(bContext *C, wmOperator *op) wm_stereo3d_set_properties(C, op); } - s3dd = op->customdata; + Stereo3dData *s3dd = op->customdata; *win_src->stereo3d_format = s3dd->stereo3d_format; if (prev_display_mode == S3D_DISPLAY_PAGEFLIP && @@ -367,7 +366,7 @@ int wm_stereo3d_set_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(ev if (wm_stereo3d_set_properties(C, op)) { return wm_stereo3d_set_exec(C, op); } - return WM_operator_props_dialog_popup(C, op, 250); + return WM_operator_props_dialog_popup(C, op, 300); } void wm_stereo3d_set_draw(bContext *UNUSED(C), wmOperator *op) @@ -379,6 +378,9 @@ void wm_stereo3d_set_draw(bContext *UNUSED(C), wmOperator *op) RNA_pointer_create(NULL, &RNA_Stereo3dDisplay, &s3dd->stereo3d_format, &stereo3d_format_ptr); + uiLayoutSetPropSep(layout, true); + uiLayoutSetPropDecorate(layout, false); + col = uiLayoutColumn(layout, false); uiItemR(col, &stereo3d_format_ptr, "display_mode", 0, NULL, ICON_NONE); |