Commit: e5804dc60798d0de172625bacb0735883842a21d
Author: Joseph Eagar
Date: Sat Nov 27 09:17:53 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rBe5804dc60798d0de172625bacb0735883842a21d
Sculpt-dev: fix corruption in dyntopo
fast pbvh leaf builder callback.
===================================================================
M source/blender/blenkernel/intern/dyntopo.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/dyntopo.c
b/source/blender/blenkernel/intern/dyntopo.c
index a05b42e2e5a..b5a3522da2d 100644
--- a/source/blender/blenkernel/intern/dyntopo.c
+++ b/source/blender/blenkernel/intern/dyntopo.c
@@ -1906,7 +1906,9 @@ static void short_edge_queue_edge_add(EdgeQueueContext
*eq_ctx, BMEdge *e)
}
}
-static void long_edge_queue_face_add(EdgeQueueContext *eq_ctx, BMFace *f, bool
ignore_frontface)
+ATTR_NO_OPT 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_bmesh.c
b/source/blender/blenkernel/intern/pbvh_bmesh.c
index 4805d5b785c..a6a0d8acf45 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -1578,7 +1578,7 @@ static void pbvh_bmesh_create_leaf_fast_task_cb(void
*__restrict userdata,
int old = BM_ELEM_CD_GET_INT(v, pbvh->cd_vert_node_offset);
- char *ptr = (char *)v;
+ char *ptr = (char *)v->head.data;
ptr += pbvh->cd_vert_node_offset;
if (old == DYNTOPO_NODE_NONE &&
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
