diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:21:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:22:52 +0300 |
commit | aba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch) | |
tree | 2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/windowmanager/intern | |
parent | 72a563cdee8fef198a200ff65b57ddb847c01795 (diff) |
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/windowmanager/intern')
4 files changed, 29 insertions, 14 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 387bc949da8..9263f3e4a52 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1736,14 +1736,16 @@ int WM_operator_call_py(bContext *C, op = wm_operator_create(wm, ot, properties, reports); if (op->type->exec) { - if (is_undo && op->type->flag & OPTYPE_UNDO) + if (is_undo && op->type->flag & OPTYPE_UNDO) { wm->op_undo_depth++; + } retval = op->type->exec(C, op); OPERATOR_RETVAL_CHECK(retval); - if (is_undo && op->type->flag & OPTYPE_UNDO && CTX_wm_manager(C) == wm) + if (is_undo && op->type->flag & OPTYPE_UNDO && CTX_wm_manager(C) == wm) { wm->op_undo_depth--; + } } else { CLOG_WARN(WM_LOG_OPERATORS, diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 75bd10df30e..9981caf0e4b 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -678,8 +678,9 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) success = true; } #if 0 - else if (retval == BKE_READ_EXOTIC_OK_OTHER) + else if (retval == BKE_READ_EXOTIC_OK_OTHER) { BKE_undo_write(C, "Import file"); + } #endif else if (retval == BKE_READ_EXOTIC_FAIL_OPEN) { BKE_reportf(reports, diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index ea92409d528..11f9ef917fd 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -165,22 +165,30 @@ int wm_gesture_evaluate(wmGesture *gesture, const wmEvent *event) #if 0 /* debug */ - if (val == 1) + if (val == 1) { printf("tweak north\n"); - if (val == 2) + } + if (val == 2) { printf("tweak north-east\n"); - if (val == 3) + } + if (val == 3) { printf("tweak east\n"); - if (val == 4) + } + if (val == 4) { printf("tweak south-east\n"); - if (val == 5) + } + if (val == 5) { printf("tweak south\n"); - if (val == 6) + } + if (val == 6) { printf("tweak south-west\n"); - if (val == 7) + } + if (val == 7) { printf("tweak west\n"); - if (val == 8) + } + if (val == 8) { printf("tweak north-west\n"); + } #endif return val; } @@ -480,8 +488,11 @@ void wm_gesture_draw(wmWindow *win) if (gt->type == WM_GESTURE_RECT) { wm_gesture_draw_rect(gt); } - // else if (gt->type == WM_GESTURE_TWEAK) - // wm_gesture_draw_line(gt); +#if 0 + else if (gt->type == WM_GESTURE_TWEAK) { + wm_gesture_draw_line(gt); + } +#endif else if (gt->type == WM_GESTURE_CIRCLE) { wm_gesture_draw_circle(gt); } diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 04a3115992f..bbaaab01b18 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -317,8 +317,9 @@ void WM_init(bContext *C, int argc, const char **argv) /* allow a path of "", this is what happens when making a new file */ #if 0 - if (BKE_main_blendfile_path_from_global()[0] == '\0') + if (BKE_main_blendfile_path_from_global()[0] == '\0') { BLI_make_file_string("/", G_MAIN->name, BKE_appdir_folder_default(), "untitled.blend"); + } #endif BLI_strncpy(G.lib, BKE_main_blendfile_path_from_global(), sizeof(G.lib)); |