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/blenkernel/intern/appdir.c | 4 ++-- source/blender/blenkernel/intern/armature.c | 4 ++-- source/blender/blenkernel/intern/colortools.c | 4 ++-- source/blender/blenkernel/intern/fluid.c | 2 +- source/blender/blenkernel/intern/main.c | 2 +- source/blender/blenkernel/intern/mesh_wrapper.c | 14 +++++++------- source/blender/blenkernel/intern/object.c | 4 ++-- source/blender/blenkernel/intern/paint.c | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index ff799d9a495..1075a46e72b 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -664,7 +664,7 @@ bool BKE_appdir_folder_id_ex(const int folder_id, return false; default: - BLI_assert(0); + BLI_assert_unreachable(); break; } @@ -719,7 +719,7 @@ const char *BKE_appdir_folder_id_user_notest(const int folder_id, const char *su get_path_user_ex(path, sizeof(path), "scripts", subfolder, version, check_is_dir); break; default: - BLI_assert(0); + BLI_assert_unreachable(); break; } diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 92759221f79..a1ebec1d756 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1691,7 +1691,7 @@ void BKE_bone_parent_transform_calc_from_matrices(int bone_flag, break; default: - BLI_assert(false); + BLI_assert_unreachable(); } } /* If removing parent pose rotation: */ @@ -1723,7 +1723,7 @@ void BKE_bone_parent_transform_calc_from_matrices(int bone_flag, break; default: - BLI_assert(false); + BLI_assert_unreachable(); } } diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 44d9bd6b2d2..f30fcc54b23 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -1374,7 +1374,7 @@ void BKE_histogram_update_sample_line(Histogram *hist, rgba[3] = 1.0f; break; default: - BLI_assert(0); + BLI_assert_unreachable(); } hist->data_luma[i] = IMB_colormanagement_get_luminance(rgba); @@ -1476,7 +1476,7 @@ static void scopes_update_cb(void *__restrict userdata, rgba[3] = 1.0f; break; default: - BLI_assert(0); + BLI_assert_unreachable(); } } else { diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 4c85fda4a37..851d8aae378 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -936,7 +936,7 @@ static void update_velocities(FluidEffectorSettings *fes, } else { /* Should never reach this block. */ - BLI_assert(false); + BLI_assert_unreachable(); } } else { diff --git a/source/blender/blenkernel/intern/main.c b/source/blender/blenkernel/intern/main.c index d1f34ad8ce9..dc678f248c9 100644 --- a/source/blender/blenkernel/intern/main.c +++ b/source/blender/blenkernel/intern/main.c @@ -182,7 +182,7 @@ void BKE_main_free(Main *mainvar) BKE_id_free_ex(mainvar, id, free_flag, false); break; default: - BLI_assert(0); + BLI_assert_unreachable(); break; } #endif diff --git a/source/blender/blenkernel/intern/mesh_wrapper.c b/source/blender/blenkernel/intern/mesh_wrapper.c index acd272ac305..5df9f7816e3 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.c +++ b/source/blender/blenkernel/intern/mesh_wrapper.c @@ -148,7 +148,7 @@ bool BKE_mesh_wrapper_minmax(const Mesh *me, float min[3], float max[3]) case ME_WRAPPER_TYPE_MDATA: return BKE_mesh_minmax(me, min, max); } - BLI_assert(0); + BLI_assert_unreachable(); return false; } @@ -189,7 +189,7 @@ void BKE_mesh_wrapper_vert_coords_copy(const Mesh *me, return; } } - BLI_assert(0); + BLI_assert_unreachable(); } void BKE_mesh_wrapper_vert_coords_copy_with_mat4(const Mesh *me, @@ -226,7 +226,7 @@ void BKE_mesh_wrapper_vert_coords_copy_with_mat4(const Mesh *me, return; } } - BLI_assert(0); + BLI_assert_unreachable(); } /** \} */ @@ -243,7 +243,7 @@ int BKE_mesh_wrapper_vert_len(const Mesh *me) case ME_WRAPPER_TYPE_MDATA: return me->totvert; } - BLI_assert(0); + BLI_assert_unreachable(); return -1; } @@ -255,7 +255,7 @@ int BKE_mesh_wrapper_edge_len(const Mesh *me) case ME_WRAPPER_TYPE_MDATA: return me->totedge; } - BLI_assert(0); + BLI_assert_unreachable(); return -1; } @@ -267,7 +267,7 @@ int BKE_mesh_wrapper_loop_len(const Mesh *me) case ME_WRAPPER_TYPE_MDATA: return me->totloop; } - BLI_assert(0); + BLI_assert_unreachable(); return -1; } @@ -279,7 +279,7 @@ int BKE_mesh_wrapper_poly_len(const Mesh *me) case ME_WRAPPER_TYPE_MDATA: return me->totpoly; } - BLI_assert(0); + BLI_assert_unreachable(); return -1; } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 00e99f193a2..b07c4b22c39 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1858,7 +1858,7 @@ bool BKE_object_data_is_in_editmode(const ID *id) case ID_AR: return ((const bArmature *)id)->edbo != NULL; default: - BLI_assert(0); + BLI_assert_unreachable(); return false; } } @@ -1905,7 +1905,7 @@ char *BKE_object_data_editmode_flush_ptr_get(struct ID *id) return &arm->needs_flush_to_id; } default: - BLI_assert(0); + BLI_assert_unreachable(); return NULL; } return NULL; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 2e81b61ad8c..3494630e1fa 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -656,7 +656,7 @@ void BKE_paint_runtime_init(const ToolSettings *ts, Paint *paint) paint->runtime.ob_mode = OB_MODE_WEIGHT_GPENCIL; } else { - BLI_assert(0); + BLI_assert_unreachable(); } } -- cgit v1.2.3