[Bf-blender-cvs] [83dbe62e71e] temp-T96710-pbvh-pixels: Renamed PBVH_UpdatePixels to PBVH_RebuildPixels.
Jeroen Bakker
noreply at git.blender.org
Tue Apr 12 12:10:41 CEST 2022
Commit: 83dbe62e71e4cf55c0a396ec86be2501365be5cd
Author: Jeroen Bakker
Date: Tue Apr 12 08:12:24 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rB83dbe62e71e4cf55c0a396ec86be2501365be5cd
Renamed PBVH_UpdatePixels to PBVH_RebuildPixels.
===================================================================
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/pbvh_pixels.cc
M source/blender/blenkernel/intern/pbvh_pixels_seams.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index e442c6bd72c..0e33de2b9ac 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -78,7 +78,7 @@ typedef enum {
PBVH_UpdateTopology = 1 << 13,
PBVH_UpdateColor = 1 << 14,
- PBVH_UpdatePixels = 1 << 15,
+ PBVH_RebuildPixels = 1 << 15,
} PBVHNodeFlags;
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 8b0ea0ab097..979446a496e 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1789,7 +1789,7 @@ void BKE_pbvh_mark_update_pixels(PBVH *pbvh)
for (int n = 0; n < pbvh->totnode; n++) {
PBVHNode *node = &pbvh->nodes[n];
if (node->flag & PBVH_Leaf) {
- node->flag |= PBVH_UpdatePixels;
+ node->flag |= PBVH_RebuildPixels;
}
}
}
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index e0c67601d33..0958cb4c1df 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -224,7 +224,7 @@ static bool should_pixels_be_updated(PBVHNode *node)
if ((node->flag & PBVH_Leaf) == 0) {
return false;
}
- if ((node->flag & PBVH_UpdatePixels) != 0) {
+ if ((node->flag & PBVH_RebuildPixels) != 0) {
return true;
}
NodeData *node_data = static_cast<NodeData *>(node->pixels.node_data);
@@ -287,7 +287,7 @@ static bool find_nodes_to_update(PBVH *pbvh,
PBVHNode *node = &pbvh->nodes[n];
if (should_pixels_be_updated(node)) {
r_nodes_to_update.append(node);
- node->flag = static_cast<PBVHNodeFlags>(node->flag | PBVH_UpdatePixels);
+ node->flag = static_cast<PBVHNodeFlags>(node->flag | PBVH_RebuildPixels);
if (node->pixels.node_data == nullptr) {
NodeData *node_data = MEM_new<NodeData>(__func__);
@@ -403,7 +403,7 @@ static void update_pixels(PBVH *pbvh,
/* Clear the UpdatePixels flag. */
for (PBVHNode *node : nodes_to_update) {
- node->flag = static_cast<PBVHNodeFlags>(node->flag & ~PBVH_UpdatePixels);
+ node->flag = static_cast<PBVHNodeFlags>(node->flag & ~PBVH_RebuildPixels);
}
//#define DO_PRINT_STATISTICS
diff --git a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
index e55f5cff59e..94b49bcb7ee 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc
@@ -271,7 +271,7 @@ class UVSeamExtender {
context,
&package,
&node_data.triangles.get_paint_input(package.triangle_index),
- (node.flag & PBVH_UpdatePixels) != 0,
+ (node.flag & PBVH_RebuildPixels) != 0,
node_data.triangles.get_loop_indices(package.triangle_index));
append(row_package);
}
More information about the Bf-blender-cvs
mailing list