[Bf-blender-cvs] [cf8b29950bf] temp-T96710-pbvh-pixels: Don't call a function to update the node state.
Jeroen Bakker
noreply at git.blender.org
Tue Apr 12 12:10:47 CEST 2022
Commit: cf8b29950bf43fcccfcd8b2172cc8a166faab0a3
Author: Jeroen Bakker
Date: Tue Apr 12 12:10:11 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rBcf8b29950bf43fcccfcd8b2172cc8a166faab0a3
Don't call a function to update the node state.
===================================================================
M source/blender/blenkernel/BKE_pbvh_pixels.hh
M source/blender/blenkernel/intern/pbvh_pixels.cc
M source/blender/editors/sculpt_paint/sculpt_paint_image.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_pbvh_pixels.hh b/source/blender/blenkernel/BKE_pbvh_pixels.hh
index 92d5b84be72..12f420cfe32 100644
--- a/source/blender/blenkernel/BKE_pbvh_pixels.hh
+++ b/source/blender/blenkernel/BKE_pbvh_pixels.hh
@@ -223,7 +223,6 @@ struct NodeData {
};
NodeData &BKE_pbvh_pixels_node_data_get(PBVHNode &node);
-void BKE_pbvh_pixels_mark_dirty(PBVHNode &node);
void BKE_pbvh_pixels_mark_image_dirty(PBVHNode &node, Image &image, ImageUser &image_user);
/** Extend pixels to fix uv seams for the given nodes. */
void BKE_pbvh_pixels_fix_seams(PBVH &pbvh,
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc
index bcb97624566..1eae3fa5537 100644
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@ -374,13 +374,6 @@ NodeData &BKE_pbvh_pixels_node_data_get(PBVHNode &node)
return *node_data;
}
-void BKE_pbvh_pixels_mark_dirty(PBVHNode &node)
-{
- BLI_assert(node.pixels.node_data != nullptr);
- NodeData *node_data = static_cast<NodeData *>(node.pixels.node_data);
- node_data->flags.dirty |= true;
-}
-
void BKE_pbvh_pixels_mark_image_dirty(PBVHNode &node, Image &image, ImageUser &image_user)
{
BLI_assert(node.pixels.node_data != nullptr);
diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
index 2c587656ef1..c293b28597a 100644
--- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
@@ -349,9 +349,7 @@ static void do_paint_pixels(void *__restrict userdata,
}
}
- if (pixels_updated) {
- BKE_pbvh_pixels_mark_dirty(*node);
- }
+ node_data.flags.dirty |= pixels_updated;
}
static void do_mark_dirty_regions(void *__restrict userdata,
More information about the Bf-blender-cvs
mailing list