[Bf-blender-cvs] [581dc18c083] sculpt-dev: Remove debug ATTR_NO_OPT
Joseph Eagar
noreply at git.blender.org
Tue Nov 16 22:32:46 CET 2021
Commit: 581dc18c083955d05426f140bf07991b92333073
Author: Joseph Eagar
Date: Tue Nov 16 13:32:28 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rB581dc18c083955d05426f140bf07991b92333073
Remove debug ATTR_NO_OPT
===================================================================
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/bmesh/intern/bmesh_construct.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 359931e8d9e..fbb415c2267 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -2320,7 +2320,7 @@ void BKE_pbvh_build_bmesh(PBVH *pbvh,
pbvh_bmesh_create_nodes_fast_recursive_create(pbvh, nodeinfo, bbc_array, &rootnode);
if (!totleaf) {
- leaves = MEM_mallocN(sizeof(void*), "leaves");
+ leaves = MEM_mallocN(sizeof(void *), "leaves");
totleaf = 1;
leaves[0] = &rootnode;
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index 038d83c662d..4bcbc5d73f6 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -192,7 +192,7 @@ void bm_id_freelist_push(BMesh *bm, uint id)
// static const int _typemap[] = {0, 0, 1, 0, 2, 0, 0, 0, 3};
-ATTR_NO_OPT void bm_assign_id_intern(BMesh *bm, BMElem *elem, uint id)
+void bm_assign_id_intern(BMesh *bm, BMElem *elem, uint id)
{
// CustomData *cdata = &bm->vdata + _typemap[elem->head.htype];
// int cd_id_off = cdata->layers[cdata->typemap[CD_MESH_ID]].offset;
More information about the Bf-blender-cvs
mailing list