diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-07-15 11:23:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-07-15 11:29:01 +0300 |
commit | 8e8a6b80cf2749d176d14eaa3bbfd0eccc9ec75e (patch) | |
tree | 7448ea0f5b8ab12f90d6d3201eab05f3618f674d /source/blender/bmesh | |
parent | a63a0ee24bf05346399a16f42d92747e1cf6a815 (diff) |
Cleanup: replace BLI_assert(!"text") with BLI_assert_msg(0, "text")
This shows the text as part of the assertion message.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 8 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_log.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_hull.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index f79f1925560..ee51a03d9fb 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -415,7 +415,7 @@ static void bm_vert_attrs_copy( BMesh *bm_src, BMesh *bm_dst, const BMVert *v_src, BMVert *v_dst, CustomDataMask mask_exclude) { if ((bm_src == bm_dst) && (v_src == v_dst)) { - BLI_assert(!"BMVert: source and target match"); + BLI_assert_msg(0, "BMVert: source and target match"); return; } if ((mask_exclude & CD_MASK_NORMAL) == 0) { @@ -430,7 +430,7 @@ static void bm_edge_attrs_copy( BMesh *bm_src, BMesh *bm_dst, const BMEdge *e_src, BMEdge *e_dst, CustomDataMask mask_exclude) { if ((bm_src == bm_dst) && (e_src == e_dst)) { - BLI_assert(!"BMEdge: source and target match"); + BLI_assert_msg(0, "BMEdge: source and target match"); return; } CustomData_bmesh_free_block_data_exclude_by_type(&bm_dst->edata, e_dst->head.data, mask_exclude); @@ -442,7 +442,7 @@ static void bm_loop_attrs_copy( BMesh *bm_src, BMesh *bm_dst, const BMLoop *l_src, BMLoop *l_dst, CustomDataMask mask_exclude) { if ((bm_src == bm_dst) && (l_src == l_dst)) { - BLI_assert(!"BMLoop: source and target match"); + BLI_assert_msg(0, "BMLoop: source and target match"); return; } CustomData_bmesh_free_block_data_exclude_by_type(&bm_dst->ldata, l_dst->head.data, mask_exclude); @@ -454,7 +454,7 @@ static void bm_face_attrs_copy( BMesh *bm_src, BMesh *bm_dst, const BMFace *f_src, BMFace *f_dst, CustomDataMask mask_exclude) { if ((bm_src == bm_dst) && (f_src == f_dst)) { - BLI_assert(!"BMFace: source and target match"); + BLI_assert_msg(0, "BMFace: source and target match"); return; } if ((mask_exclude & CD_MASK_NORMAL) == 0) { diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index 1febae54b39..9033e43374b 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -740,7 +740,7 @@ void BM_log_entry_drop(BMLogEntry *entry) bm_log_id_ghash_release(log, entry->added_verts); } else { - BLI_assert(!"Cannot drop BMLogEntry from middle"); + BLI_assert_msg(0, "Cannot drop BMLogEntry from middle"); } if (log->current_entry == entry) { diff --git a/source/blender/bmesh/operators/bmo_hull.c b/source/blender/bmesh/operators/bmo_hull.c index 0801300b6c2..740815691cc 100644 --- a/source/blender/bmesh/operators/bmo_hull.c +++ b/source/blender/bmesh/operators/bmo_hull.c @@ -465,7 +465,7 @@ static BMVert **hull_verts_from_bullet(plConvexHull hull, hull_verts[i] = input_verts[original_index]; } else { - BLI_assert(!"Unexpected new vertex in hull output"); + BLI_assert_msg(0, "Unexpected new vertex in hull output"); } } diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 28d0aecbb3d..1e8ef9737d3 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1676,7 +1676,7 @@ static void project_to_edge(const BMEdge *e, float otherco[3]; if (!isect_line_line_v3(e->v1->co, e->v2->co, co_a, co_b, projco, otherco)) { #ifdef BEVEL_ASSERT_PROJECT - BLI_assert(!"project meet failure"); + BLI_assert_msg(0, "project meet failure"); #endif copy_v3_v3(projco, e->v1->co); } @@ -6262,7 +6262,7 @@ static BevVert *bevel_vert_construct(BMesh *bm, BevelParams *bp, BMVert *v) break; } default: { - BLI_assert(!"bad bevel offset kind"); + BLI_assert_msg(0, "bad bevel offset kind"); e->offset_l_spec = bp->offset; break; } |