[Bf-blender-cvs] [d2d5d382c56] sculpt-dev: sculpt-dev: Fix bmesh toolflags crash
Joseph Eagar
noreply at git.blender.org
Sat May 14 08:48:32 CEST 2022
Commit: d2d5d382c560bf11d3528b09c36676a79ff22f85
Author: Joseph Eagar
Date: Fri May 13 23:48:26 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rBd2d5d382c560bf11d3528b09c36676a79ff22f85
sculpt-dev: Fix bmesh toolflags crash
===================================================================
M source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index b169dd1776e..ef52af37d63 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -85,6 +85,16 @@ void BM_mesh_elem_toolflags_ensure(BMesh *bm)
{
BLI_assert(bm->use_toolflags);
+ if (!CustomData_has_layer(&bm->vdata, CD_TOOLFLAGS)) {
+ if (bm->vtoolflagpool) {
+ printf("%s: Error: toolflags were deallocated improperly\n", __func__);
+
+ BM_mesh_elem_toolflags_clear(bm);
+
+ bm_alloc_toolflags_cdlayers(bm, true);
+ }
+ }
+
if (bm->vtoolflagpool && bm->etoolflagpool && bm->ftoolflagpool) {
return;
}
More information about the Bf-blender-cvs
mailing list