griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Mistake in previous paint BVH cleanup commit

Browse Source 
55cf0925ec
This commit is contained in:
Hans Goudey
2024-11-01 17:36:57 +01:00
parent 0be2535369
commit 3d6e1c7bac
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/pbvh_bmesh.cc
View File

@@ -454,7 +454,7 @@ static BMVert *pbvh_bmesh_vert_create(BMesh &bm,
node->bm_unique_verts_.add(v);
BM_ELEM_CD_SET_INT(v, cd_vert_node_offset, node_index);
node->flag_ |= Node::Leaf;
node->flag_ |= Node::TopologyUpdated;
node_changed[node_index] = true;
/* Log the new vertex. */
@@ -487,7 +487,7 @@ static BMFace *pbvh_bmesh_face_create(BMesh &bm,
node->bm_faces_.add(f);
BM_ELEM_CD_SET_INT(f, cd_face_node_offset, node_index);
node->flag_ |= Node::Leaf;
node->flag_ |= Node::TopologyUpdated;
node_changed[node_index] = true;
node->flag_ &= ~Node::FullyHidden;
@@ -551,7 +551,7 @@ static void pbvh_bmesh_vert_ownership_transfer(MutableSpan<BMeshNode> nodes,
{
const int current_owner_index = pbvh_bmesh_node_index_from_vert(cd_vert_node_offset, v);
BMeshNode *current_owner = &nodes[current_owner_index];
current_owner->flag_ |= Node::Leaf;
current_owner->flag_ |= Node::TopologyUpdated;
node_changed[new_owner_index] = true;
BMeshNode *new_owner = &nodes[new_owner_index];
@@ -567,7 +567,7 @@ static void pbvh_bmesh_vert_ownership_transfer(MutableSpan<BMeshNode> nodes,
new_owner->bm_other_verts_.remove(v);
BLI_assert(!new_owner->bm_other_verts_.contains(v));
new_owner->flag_ |= Node::Leaf;
new_owner->flag_ |= Node::TopologyUpdated;
node_changed[new_owner_index] = true;
}
@@ -594,7 +594,7 @@ static void pbvh_bmesh_vert_remove(MutableSpan<BMeshNode> nodes,
f_node_index_prev = f_node_index;
BMeshNode *f_node = &nodes[f_node_index];
f_node->flag_ |= Node::Leaf;
f_node->flag_ |= Node::TopologyUpdated;
node_changed[f_node_index] = true;
/* Remove current ownership. */
@@ -650,7 +650,7 @@ static void pbvh_bmesh_face_remove(MutableSpan<BMeshNode> nodes,
BM_log_face_removed(&bm_log, f);
/* Mark node for update. */
f_node->flag_ |= Node::Leaf;
f_node->flag_ |= Node::TopologyUpdated;
node_changed[node_index] = true;
}
@@ -2374,8 +2374,8 @@ bool bmesh_update_topology(BMesh &bm,
/* Go over all changed nodes and check if anything needs to be updated. */
for (BMeshNode &node : nodes) {
if (node.flag_ & Node::Leaf && node.flag_ & Node::Leaf) {
node.flag_ &= ~Node::Leaf;
if (node.flag_ & Node::Leaf && node.flag_ & Node::TopologyUpdated) {
node.flag_ &= ~Node::TopologyUpdated;
if (!node.orig_tris_.is_empty()) {
/* Reallocate original triangle data. */