diff options
Diffstat (limited to 'source/blender/editors')
5 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index 653bd72b364..4f4746fd799 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -83,8 +83,7 @@ static ListBase *fmodifier_list_space_specific(const bContext *C) } /* This should not be called in any other space. */ - BLI_assert(false); - return NULL; + BLI_UNREACHABLE_ABORT; } /** diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index e4527740164..134e8f9bf55 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -831,7 +831,7 @@ static const char *get_effector_defname(ePFieldType type) } BLI_assert(false); - return CTX_DATA_(BLT_I18NCONTEXT_ID_OBJECT, "Field"); + BLI_UNREACHABLE_ABORT; } static int effector_add_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.c b/source/blender/editors/sculpt_paint/sculpt_geodesic.c index d86d0938300..7577c4e8f30 100644 --- a/source/blender/editors/sculpt_paint/sculpt_geodesic.c +++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.c @@ -315,8 +315,7 @@ float *SCULPT_geodesic_distances_create(Object *ob, case PBVH_GRIDS: return SCULPT_geodesic_fallback_create(ob, initial_vertices); } - BLI_assert(false); - return NULL; + BLI_UNREACHABLE_ABORT; } float *SCULPT_geodesic_from_vertex_and_symm(Sculpt *sd, diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 43d45db38e2..6b1d64d85f4 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -308,8 +308,7 @@ static const char *buttons_main_region_context_string(const short mainb) } /* All the cases should be handled. */ - BLI_assert(false); - return ""; + BLI_UNREACHABLE_ABORT; } static void buttons_main_region_layout_properties(const bContext *C, diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index f64ce771b25..c366818cf3c 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -1196,7 +1196,7 @@ static int node_error_type_to_icon(const NodeWarningType type) } BLI_assert(false); - return ICON_ERROR; + BLI_UNREACHABLE_ABORT; } static uint8_t node_error_type_priority(const NodeWarningType type) @@ -1209,9 +1209,7 @@ static uint8_t node_error_type_priority(const NodeWarningType type) case NodeWarningType::Info: return 1; } - - BLI_assert(false); - return 0; + BLI_UNREACHABLE_ABORT; } static NodeWarningType node_error_highest_priority(Span<NodeWarning> warnings) |