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

Cleanup: Rename NodeMaskResult to CursorSampleResult

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/137706
This commit is contained in:
Sean Kim
2025-04-18 19:36:14 +02:00
committed by Sean Kim
parent bffc3f824e
commit b8014af7e0
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/sculpt_paint/brushes/brushes.hh
View File

@@ -25,7 +25,7 @@ class Node;
namespace blender::ed::sculpt_paint::brushes {
/** Represents the result of one or more BVH queries to find a brush's affected nodes. */
struct NodeMaskResult {
struct CursorSampleResult {
IndexMask node_mask;
/* For planar brushes, the plane center and normal are calculated based on the original cursor
@@ -53,10 +53,10 @@ void do_clay_strips_brush(const Depsgraph &depsgraph,
const float3 &plane_normal,
const float3 &plane_center);
namespace clay_strips {
NodeMaskResult calc_node_mask(const Depsgraph &depsgraph,
Object &ob,
const Brush &brush,
IndexMaskMemory &memory);
CursorSampleResult calc_node_mask(const Depsgraph &depsgraph,
Object &ob,
const Brush &brush,
IndexMaskMemory &memory);
}
void do_clay_thumb_brush(const Depsgraph &depsgraph,
const Sculpt &sd,
@@ -129,10 +129,10 @@ void do_plane_brush(const Depsgraph &depsgraph,
const float3 &plane_center);
namespace plane {
NodeMaskResult calc_node_mask(const Depsgraph &depsgraph,
Object &ob,
const Brush &brush,
IndexMaskMemory &memory);
CursorSampleResult calc_node_mask(const Depsgraph &depsgraph,
Object &ob,
const Brush &brush,
IndexMaskMemory &memory);
}
void do_grab_brush(const Depsgraph &depsgraph,

8
source/blender/editors/sculpt_paint/brushes/clay_strips.cc
View File

@@ -338,10 +338,10 @@ void do_clay_strips_brush(const Depsgraph &depsgraph,
}
namespace clay_strips {
NodeMaskResult calc_node_mask(const Depsgraph &depsgraph,
Object &object,
const Brush &brush,
IndexMaskMemory &memory)
CursorSampleResult calc_node_mask(const Depsgraph &depsgraph,
Object &object,
const Brush &brush,
IndexMaskMemory &memory)
{
const bke::pbvh::Tree &pbvh = *bke::object::pbvh_get(object);
const SculptSession &ss = *object.sculpt;

8
source/blender/editors/sculpt_paint/brushes/plane.cc
View File

@@ -465,10 +465,10 @@ void do_plane_brush(const Depsgraph &depsgraph,
}
namespace plane {
NodeMaskResult calc_node_mask(const Depsgraph &depsgraph,
Object &ob,
const Brush &brush,
IndexMaskMemory &memory)
CursorSampleResult calc_node_mask(const Depsgraph &depsgraph,
Object &ob,
const Brush &brush,
IndexMaskMemory &memory)
{
const SculptSession &ss = *ob.sculpt;
const bke::pbvh::Tree &pbvh = *bke::object::pbvh_get(ob);

10
source/blender/editors/sculpt_paint/sculpt.cc
View File

@@ -3133,10 +3133,10 @@ static bool brush_type_needs_all_pbvh_nodes(const Brush &brush)
}
/** Calculates the nodes that a brush will influence. */
static brushes::NodeMaskResult calc_brush_node_mask(const Depsgraph &depsgraph,
Object &ob,
const Brush &brush,
IndexMaskMemory &memory)
static brushes::CursorSampleResult calc_brush_node_mask(const Depsgraph &depsgraph,
Object &ob,
const Brush &brush,
IndexMaskMemory &memory)
{
const SculptSession &ss = *ob.sculpt;
const bke::pbvh::Tree &pbvh = *bke::object::pbvh_get(ob);
@@ -3233,7 +3233,7 @@ static void do_brush_action(const Depsgraph &depsgraph,
}
}
const brushes::NodeMaskResult node_mask_result = calc_brush_node_mask(
const brushes::CursorSampleResult node_mask_result = calc_brush_node_mask(
depsgraph, ob, brush, memory);
const IndexMask node_mask = node_mask_result.node_mask;