[Bf-blender-cvs] [777168cc00e] sculpt-dev: Sculpt-dev: fix memory corruption

[Joseph Eagar]

Commit: 777168cc00ea47925da42d9276feeb1e67165e0d
Author: Joseph Eagar
Date:   Sun Nov 28 02:37:01 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rB777168cc00ea47925da42d9276feeb1e67165e0d

Sculpt-dev: fix memory corruption

===================================================================

M	source/blender/blenkernel/intern/dyntopo.c
M	source/blender/blenkernel/intern/pbvh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/dyntopo.c b/source/blender/blenkernel/intern/dyntopo.c
index b5a3522da2d..a05b42e2e5a 100644
--- a/source/blender/blenkernel/intern/dyntopo.c
+++ b/source/blender/blenkernel/intern/dyntopo.c
@@ -1906,9 +1906,7 @@ static void short_edge_queue_edge_add(EdgeQueueContext *eq_ctx, BMEdge *e)
   }
 }
 
-ATTR_NO_OPT static void long_edge_queue_face_add(EdgeQueueContext *eq_ctx,
-                                                 BMFace *f,
-                                                 bool ignore_frontface)
+static void long_edge_queue_face_add(EdgeQueueContext *eq_ctx, BMFace *f, bool ignore_frontface)
 {
 #ifdef USE_EDGEQUEUE_FRONTFACE
   if (!ignore_frontface && eq_ctx->q->use_view_normal) {
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 518f065e8b6..86961354764 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -4379,7 +4379,6 @@ static void pbvh_pmap_to_edges_add(PBVH *pbvh,
 
   if (*len >= *r_edges_size) {
     int newsize = *len + ((*len) >> 1) + 1;
-    *heap_alloc = true;
 
     int *r_edges_new = MEM_malloc_arrayN(newsize, sizeof(*r_edges_new), "r_edges_new");
     int *r_polys_new = MEM_malloc_arrayN(newsize * 2, sizeof(*r_polys_new), "r_polys_new");