From 3f47df577d05478a324b6eca80df0a33c838fab8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 24 Mar 2021 12:38:08 +1100 Subject: Cleanup: use new BLI_assert_unreachable macro --- source/blender/windowmanager/intern/wm_event_system.c | 6 +++--- source/blender/windowmanager/intern/wm_files.c | 2 +- source/blender/windowmanager/intern/wm_files_link.c | 2 +- source/blender/windowmanager/intern/wm_operators.c | 6 +++--- source/blender/windowmanager/intern/wm_window.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/windowmanager/intern') diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index ed1b53e8e20..791aeeb39cd 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -144,7 +144,7 @@ wmEvent *wm_event_add(wmWindow *win, const wmEvent *event_to_add) wmEvent *WM_event_add_simulate(wmWindow *win, const wmEvent *event_to_add) { if ((G.f & G_FLAG_EVENT_SIMULATE) == 0) { - BLI_assert(0); + BLI_assert_unreachable(); return NULL; } wmEvent *event = wm_event_add(win, event_to_add); @@ -1037,7 +1037,7 @@ static void wm_operator_finished(bContext *C, wmOperator *op, const bool repeat, ED_area_type_hud_clear(wm, NULL); } else { - BLI_assert(0); + BLI_assert_unreachable(); } } } @@ -2885,7 +2885,7 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers } else { /* Unreachable (handle all types above). */ - BLI_assert(0); + BLI_assert_unreachable(); } if (action & WM_HANDLER_BREAK) { diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index a9b30f91bee..bbcb0669cce 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -2298,7 +2298,7 @@ static int operator_state_dispatch(bContext *C, wmOperator *op, OperatorDispatch return target.run(C, op); } } - BLI_assert(false); + BLI_assert_unreachable(); return OPERATOR_CANCELLED; } diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index bf7cf81f0a9..840debad01b 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -750,7 +750,7 @@ static void lib_relocate_do_remap(Main *bmain, /* In some cases, new_id might become direct link, remove parent of library in this case. */ if (new_id->lib->parent && (new_id->tag & LIB_TAG_INDIRECT) == 0) { if (do_reload) { - BLI_assert(0); /* Should not happen in 'pure' reload case... */ + BLI_assert_unreachable(); /* Should not happen in 'pure' reload case... */ } new_id->lib->parent = NULL; } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index e8a41b04d84..84c16999c1b 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1229,7 +1229,7 @@ ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short i id = (ID *)BKE_image_load_exists_ex(bmain, path, &exists); } else { - BLI_assert(0); + BLI_assert_unreachable(); } if (!id) { @@ -1248,7 +1248,7 @@ ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short i BLI_path_rel(((Image *)id)->filepath, BKE_main_blendfile_path(bmain)); } else { - BLI_assert(0); + BLI_assert_unreachable(); } } } @@ -1687,7 +1687,7 @@ static uiBlock *wm_block_search_menu(bContext *C, ARegion *region, void *userdat UI_but_func_menu_search(but); } else { - BLI_assert(0); + BLI_assert_unreachable(); } UI_but_flag_enable(but, UI_BUT_ACTIVATE_ON_INIT); diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 25232e8e3d5..eb1da15807c 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -2174,7 +2174,7 @@ void WM_window_screen_rect_calc(const wmWindow *win, rcti *r_rect) screen_rect.ymin += height; break; default: - BLI_assert(0); + BLI_assert_unreachable(); break; } } -- cgit v1.2.3