[Bf-blender-cvs] [3f47df577d0] master: Cleanup: use new BLI_assert_unreachable macro
Campbell Barton
noreply at git.blender.org
Wed Mar 24 05:42:45 CET 2021
Commit: 3f47df577d05478a324b6eca80df0a33c838fab8
Author: Campbell Barton
Date: Wed Mar 24 12:38:08 2021 +1100
Branches: master
https://developer.blender.org/rB3f47df577d05478a324b6eca80df0a33c838fab8
Cleanup: use new BLI_assert_unreachable macro
===================================================================
M source/blender/blenkernel/intern/appdir.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/main.c
M source/blender/blenkernel/intern/mesh_wrapper.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/paint.c
M source/blender/editors/util/ed_util.c
M source/blender/editors/util/select_utils.c
M source/blender/editors/uvedit/uvedit_rip.c
M source/blender/editors/uvedit/uvedit_select.c
M source/blender/imbuf/intern/thumbs.c
M source/blender/python/bmesh/bmesh_py_types.c
M source/blender/python/bmesh/bmesh_py_types_customdata.c
M source/blender/python/generic/imbuf_py_api.c
M source/blender/python/gpu/gpu_py_matrix.c
M source/blender/python/gpu/gpu_py_vertex_buffer.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils_Matrix.c
M source/blender/sequencer/intern/sequencer.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_files_link.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
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();
}
}
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 9903711834a..da94eef4917 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -146,7 +146,7 @@ void ED_editors_init(bContext *C)
ED_object_wpaintmode_enter_ex(bmain, depsgraph, scene, ob);
}
else {
- BLI_assert(0);
+ BLI_assert_unreachable();
}
}
else {
diff --git a/source/blender/editors/util/select_utils.c b/source/blender/editors/util/select_utils.c
index 85f48e6d397..14a6d751bb1 100644
--- a/source/blender/editors/util/select_utils.c
+++ b/source/blender/editors/util/select_utils.c
@@ -94,7 +94,7 @@ int ED_select_similar_compare_float(const float delta, const float thresh, const
case SIM_CMP_LT:
return ((delta - thresh) < FLT_EPSILON);
default:
- BLI_assert(0);
+ BLI_assert_unreachable();
return 0;
}
}
@@ -124,7 +124,7 @@ bool ED_select_similar_compare_float_tree(const KDTree_1d *tree,
nearest_edge_length = FLT_MAX;
break;
default:
- BLI_assert(0);
+ BLI_assert_unreachable();
return false;
}
diff --git a/source/blender/editors/uvedit/uvedit_rip.c b/source/blender/editors/uvedit/uvedit_rip.c
index c8aa21191ba..e1b9a287457 100644
--- a/source/blender/editors/uvedit/uvedit_rip.c
+++ b/source/blender/editors/uvedit/uvedit_rip.c
@@ -169,7 +169,7 @@ static BMLoop *bm_loop_find_other_fan_loop_with_visible_face(BMLoop *l_src,
l_other = l_other->prev;
}
else {
- BLI_assert(0);
+ BLI_assert_unreachable();
}
}
return l_other;
@@ -189,7 +189,7 @@ static BMLoop *bm_vert_step_fan_loop_uv(BMLoop *l, BMEdge **e_step, const int cd
l_next = l;
}
else {
- BLI_assert(0);
+ BLI_assert_unreachable();
return NULL;
}
diff --git a/source/blender/editors/uvedit/uvedit_select.c b/source/blender/editors/uvedit/uvedit_select.c
index f46975c9378..c10e132a4e2 100644
--- a/source/blender/editors/uvedit/uvedit_select.c
+++ b/source/blender/editors/uvedit/uvedit_select.c
@@ -2213,7 +2213,7 @@ static int uv_mouse_select_loop_generic_multi(bContext *C,
flush = uv_select_edgering(sima, scene, obedit, &hit, extend);
}
else {
- BLI_assert(0);
+ BLI_assert_unreachable();
}
if (ts->uv_flag & UV_SYNC_SELECTION) {
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 0d2080b5f0a..61bc185eb8d 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -393,7 +393,7 @@ static ImBuf *thumb_create_ex(const char *file_path,
img = IMB_thumb_load_font(file_path, tsize, tsize);
break;
default:
- BLI_assert(0); /* This should never happen */
+ BLI_assert_unreachable(); /* This should never happen */
}
}
@@ -738,7 +738,7 @@ void IMB_thumb_path_unlock(const char *path)
if (thumb_locks.locked_paths) {
if (!BLI_gset_remove(thumb_locks.locked_paths, key, MEM_freeN)) {
- BLI_assert(0);
+ BLI_assert_unreachable();
}
BLI_condition_notify_all(&thumb_locks.cond);
}
diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c
index 5fca6f4cec6..563a76ac824 100644
--- a/source/blender/python/bmesh/bmesh_py_types.c
+++ b/source/blender/python/bmesh/bmesh_py_types.c
@@ -3984,7 +3984,7 @@ PyObject *BPy_BMElem_CreatePyObject(BMesh *bm, BMHeader *ele)
case BM_LOOP:
return BPy_BMLoop_CreatePyObject(bm, (BMLoop *)ele);
default:
- BLI_assert(0);
+ BLI_assert_unreachable();
PyErr_SetString(PyExc_SystemError, "internal error");
return NULL;
}
diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c
index 471a311c411..78c43d18609 100644
--- a/source/blender/python/bmesh/bmesh_py_types_customdata.c
+++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c
@@ -56,7 +56,7 @@ static CustomData *bpy_bm_customdata_get(BMesh *bm, char htype)
return &bm->ldata;
}
- BLI_assert(0);
+ BLI_assert_unrea
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list