[Bf-blender-cvs] [de5d36560f9] master: Fix T93574: Asset triangulating a mesh
Campbell Barton
noreply at git.blender.org
Fri Dec 3 06:56:52 CET 2021
Commit: de5d36560f9300e56d11e03ec6be161367d58df2
Author: Campbell Barton
Date: Fri Dec 3 16:53:18 2021 +1100
Branches: master
https://developer.blender.org/rBde5d36560f9300e56d11e03ec6be161367d58df2
Fix T93574: Asset triangulating a mesh
Correct assert for edit-mesh normal calculation.
===================================================================
M source/blender/bmesh/intern/bmesh_mesh_normals.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.c b/source/blender/bmesh/intern/bmesh_mesh_normals.c
index 8119d9eb57d..b7dc51abae1 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_normals.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_normals.c
@@ -520,7 +520,8 @@ static int bm_mesh_loops_calc_normals_for_loop(BMesh *bm,
float (*r_lnos)[3],
MLoopNorSpaceArray *r_lnors_spacearr)
{
- BLI_assert((bm->elem_index_dirty & (BM_FACE | BM_LOOP)) == 0);
+ BLI_assert((bm->elem_index_dirty & BM_LOOP) == 0);
+ BLI_assert((fnos == NULL) || ((bm->elem_index_dirty & BM_FACE) == 0));
BLI_assert((vcos == NULL) || ((bm->elem_index_dirty & BM_VERT) == 0));
UNUSED_VARS_NDEBUG(bm);
More information about the Bf-blender-cvs
mailing list