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

Cleanup: Move paint hide file to namespace

Browse Source
This commit is contained in:
Hans Goudey
2023-11-30 10:41:28 -05:00
parent 68baa04eeb
commit 11b4e9311f
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/sculpt_paint/paint_hide.cc
View File

@@ -52,6 +52,8 @@
using blender::Span;
using blender::Vector;
namespace blender::ed::sculpt_paint::hide {
enum PartialVisAction {
PARTIALVIS_HIDE,
PARTIALVIS_SHOW,
@@ -88,13 +90,12 @@ static void partialvis_update_mesh(Object *ob,
float planes[4][4],
const Span<PBVHNode *> nodes)
{
using namespace blender;
for (PBVHNode *node : nodes) {
Mesh *mesh = static_cast<Mesh *>(ob->data);
const blender::Span<blender::float3> positions = BKE_pbvh_get_vert_positions(pbvh);
const Span<float3> positions = BKE_pbvh_get_vert_positions(pbvh);
bool any_changed = false, any_visible = false;
const blender::Span<int> verts = BKE_pbvh_node_get_vert_indices(node);
const Span<int> verts = BKE_pbvh_node_get_vert_indices(node);
bke::MutableAttributeAccessor attributes = mesh->attributes_for_write();
const VArray<float> mask = *attributes.lookup_or_default<float>(
@@ -147,7 +148,7 @@ static void partialvis_update_grids(Depsgraph *depsgraph,
SculptSession *ss = ob->sculpt;
SubdivCCG *subdiv_ccg = ss->subdiv_ccg;
blender::MutableSpan<BLI_bitmap *> grid_hidden = subdiv_ccg->grid_hidden;
MutableSpan<BLI_bitmap *> grid_hidden = subdiv_ccg->grid_hidden;
CCGKey key = *BKE_pbvh_get_grid_key(pbvh);
SCULPT_undo_push_node(ob, node, SCULPT_UNDO_HIDDEN);
@@ -218,7 +219,7 @@ static void partialvis_update_grids(Depsgraph *depsgraph,
}
static void partialvis_update_bmesh_verts(BMesh *bm,
const blender::Set<BMVert *, 0> &verts,
const Set<BMVert *, 0> &verts,
PartialVisAction action,
PartialVisArea area,
float planes[4][4],
@@ -246,7 +247,7 @@ static void partialvis_update_bmesh_verts(BMesh *bm,
}
}
static void partialvis_update_bmesh_faces(const blender::Set<BMFace *, 0> &faces)
static void partialvis_update_bmesh_faces(const Set<BMFace *, 0> &faces)
{
for (BMFace *f : faces) {
if (paint_is_bmesh_face_hidden(f)) {
@@ -471,3 +472,5 @@ void PAINT_OT_hide_show(wmOperatorType *ot)
WM_operator_properties_border(ot);
}
} // namespace blender::ed::sculpt_paint::hide

2
source/blender/editors/sculpt_paint/paint_intern.hh
View File

@@ -454,7 +454,9 @@ enum BrushStrokeMode {
/* paint_hide.cc */
namespace blender::ed::sculpt_paint::hide {
void PAINT_OT_hide_show(wmOperatorType *ot);
}
/* `paint_mask.cc` */

2
source/blender/editors/sculpt_paint/paint_ops.cc
View File

@@ -1548,7 +1548,7 @@ void ED_operatortypes_paint()
WM_operatortype_append(PAINT_OT_face_vert_reveal);
/* partial visibility */
WM_operatortype_append(PAINT_OT_hide_show);
WM_operatortype_append(blender::ed::sculpt_paint::hide::PAINT_OT_hide_show);
/* paint masking */
WM_operatortype_append(PAINT_OT_mask_flood_fill);