[Bf-blender-cvs] [cef3230e29c] refactor-mesh-hide-generic: Change hide attribute names
Hans Goudey
noreply at git.blender.org
Sat Jun 4 13:22:42 CEST 2022
Commit: cef3230e29c952c232c6b9039116ac3fe02d3f68
Author: Hans Goudey
Date: Sat Jun 4 13:22:33 2022 +0200
Branches: refactor-mesh-hide-generic
https://developer.blender.org/rBcef3230e29c952c232c6b9039116ac3fe02d3f68
Change hide attribute names
===================================================================
M source/blender/blenkernel/intern/bvhutils.cc
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_evaluate.cc
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/subdiv_converter_mesh.c
M source/blender/bmesh/intern/bmesh_mesh_convert.cc
M source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
M source/blender/editors/mesh/editface.cc
M source/blender/editors/mesh/meshtools.cc
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/sculpt_paint/paint_hide.c
M source/blender/editors/sculpt_paint/sculpt_dyntopo.c
M source/blender/editors/space_view3d/view3d_iterators.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesrna/intern/rna_mesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/bvhutils.cc b/source/blender/blenkernel/intern/bvhutils.cc
index 619fdeb8d03..32db942784b 100644
--- a/source/blender/blenkernel/intern/bvhutils.cc
+++ b/source/blender/blenkernel/intern/bvhutils.cc
@@ -1288,7 +1288,7 @@ BVHTree *BKE_bvhtree_from_mesh_get(struct BVHTreeFromMesh *data,
mask = looptri_no_hidden_map_get(
mesh->mpoly,
- component.attribute_get_for_read<bool>(".face_hide", ATTR_DOMAIN_FACE, false),
+ component.attribute_get_for_read<bool>(".hide_face", ATTR_DOMAIN_FACE, false),
looptri_len,
&mask_bits_act_len);
ATTR_FALLTHROUGH;
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 7a18b0043c0..94df7a9ff5d 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -216,14 +216,14 @@ static void prepare_legacy_hide_data_for_writing(Mesh &mesh)
MutableSpan<MVert> verts(mesh.mvert, mesh.totvert);
const VArray<bool> vert_hide = component.attribute_get_for_read<bool>(
- ".vert_hide", ATTR_DOMAIN_POINT, false);
+ ".hide_vert", ATTR_DOMAIN_POINT, false);
for (const int i : verts.index_range()) {
SET_FLAG_FROM_TEST(verts[i].flag, vert_hide[i], ME_HIDE);
}
MutableSpan<MEdge> edges(mesh.medge, mesh.totedge);
const VArray<bool> edge_hide = component.attribute_get_for_read<bool>(
- ".edge_hide", ATTR_DOMAIN_EDGE, false);
+ ".hide_edge", ATTR_DOMAIN_EDGE, false);
for (const int i : edges.index_range()) {
SET_FLAG_FROM_TEST(edges[i].flag, edge_hide[i], ME_HIDE);
}
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc
index 842bcc72450..84746c395a7 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.cc
+++ b/source/blender/blenkernel/intern/mesh_evaluate.cc
@@ -1013,21 +1013,21 @@ void BKE_mesh_flush_hidden_from_verts(Mesh *me)
component.replace(me, GeometryOwnershipType::Editable);
const VArray<bool> vert_hide = component.attribute_get_for_read<bool>(
- ".vert_hide", ATTR_DOMAIN_POINT, false);
+ ".hide_vert", ATTR_DOMAIN_POINT, false);
if (vert_hide.is_single() && !vert_hide.get_internal_single()) {
- component.attribute_try_delete(".edge_hide");
- component.attribute_try_delete(".face_hide");
+ component.attribute_try_delete(".hide_edge");
+ component.attribute_try_delete(".hide_face");
return;
}
OutputAttribute_Typed<bool> edge_hide = component.attribute_try_get_for_output_only<bool>(
- ".edge_hide", ATTR_DOMAIN_EDGE);
+ ".hide_edge", ATTR_DOMAIN_EDGE);
component.attribute_try_adapt_domain(vert_hide, ATTR_DOMAIN_POINT, ATTR_DOMAIN_EDGE)
.materialize(edge_hide.as_span());
edge_hide.save();
OutputAttribute_Typed<bool> face_hide = component.attribute_try_get_for_output_only<bool>(
- ".face_hide", ATTR_DOMAIN_FACE);
+ ".hide_face", ATTR_DOMAIN_FACE);
component.attribute_try_adapt_domain(vert_hide, ATTR_DOMAIN_POINT, ATTR_DOMAIN_FACE)
.materialize(face_hide.as_span());
face_hide.save();
@@ -1039,21 +1039,21 @@ void BKE_mesh_flush_hidden_from_polys(Mesh *me)
component.replace(me, GeometryOwnershipType::Editable);
const VArray<bool> face_hide = component.attribute_get_for_read<bool>(
- ".face_hide", ATTR_DOMAIN_FACE, false);
+ ".hide_face", ATTR_DOMAIN_FACE, false);
if (face_hide.is_single() && !face_hide.get_internal_single()) {
- component.attribute_try_delete(".vert_hide");
- component.attribute_try_delete(".edge_hide");
+ component.attribute_try_delete(".hide_vert");
+ component.attribute_try_delete(".hide_edge");
return;
}
OutputAttribute_Typed<bool> edge_hide = component.attribute_try_get_for_output_only<bool>(
- ".edge_hide", ATTR_DOMAIN_EDGE);
+ ".hide_edge", ATTR_DOMAIN_EDGE);
component.attribute_try_adapt_domain(face_hide, ATTR_DOMAIN_FACE, ATTR_DOMAIN_EDGE)
.materialize(edge_hide.as_span());
edge_hide.save();
OutputAttribute_Typed<bool> vert_hide = component.attribute_try_get_for_output_only<bool>(
- ".vert_hide", ATTR_DOMAIN_POINT);
+ ".hide_vert", ATTR_DOMAIN_POINT);
component.attribute_try_adapt_domain(face_hide, ATTR_DOMAIN_FACE, ATTR_DOMAIN_POINT)
.materialize(vert_hide.as_span());
vert_hide.save();
@@ -1149,8 +1149,8 @@ void BKE_mesh_flush_select_from_verts(Mesh *me)
mesh_flush_select_from_verts(
{me->mvert, me->totvert},
{me->mloop, me->totloop},
- component.attribute_get_for_read<bool>(".edge_hide", ATTR_DOMAIN_EDGE, false),
- component.attribute_get_for_read<bool>(".face_hide", ATTR_DOMAIN_FACE, false),
+ component.attribute_get_for_read<bool>(".hide_edge", ATTR_DOMAIN_EDGE, false),
+ component.attribute_get_for_read<bool>(".hide_face", ATTR_DOMAIN_FACE, false),
{me->medge, me->totedge},
{me->mpoly, me->totpoly});
}
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 819fd85d5f5..7f7cd958f9f 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -2037,7 +2037,7 @@ void BKE_sculpt_face_sets_ensure_from_base_mesh_visibility(Mesh *mesh)
int *face_sets = CustomData_get_layer(&mesh->pdata, CD_SCULPT_FACE_SETS);
const bool *face_hide = (const bool *)CustomData_get_layer_named(
- &mesh->pdata, CD_PROP_BOOL, ".face_hide");
+ &mesh->pdata, CD_PROP_BOOL, ".hide_face");
for (int i = 0; i < mesh->totpoly; i++) {
if (!(face_hide && face_hide[i])) {
@@ -2065,7 +2065,7 @@ void BKE_sculpt_sync_face_sets_visibility_to_base_mesh(Mesh *mesh)
return;
}
- bool *face_hide = (bool *)CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, ".face_hide");
+ bool *face_hide = (bool *)CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, ".hide_face");
if (!face_hide) {
return;
}
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 28d635bdc65..a8969460593 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -562,7 +562,7 @@ void BKE_pbvh_build_mesh(PBVH *pbvh,
pbvh->verts = verts;
BKE_mesh_vertex_normals_ensure(mesh);
pbvh->vert_normals = BKE_mesh_vertex_normals_for_write(mesh);
- pbvh->vert_hide = (bool *)CustomData_get_layer_named(&mesh->vdata, CD_PROP_BOOL, ".vert_hide");
+ pbvh->vert_hide = (bool *)CustomData_get_layer_named(&mesh->vdata, CD_PROP_BOOL, ".hide_vert");
pbvh->vert_bitmap = MEM_calloc_arrayN(totvert, sizeof(bool), "bvh->vert_bitmap");
pbvh->totvert = totvert;
pbvh->leaf_limit = LEAF_LIMIT;
@@ -3155,12 +3155,12 @@ bool *BKE_pbvh_get_vert_hide_for_write(PBVH *pbvh)
if (pbvh->vert_hide) {
return pbvh->vert_hide;
}
- pbvh->vert_hide = CustomData_get_layer_named(&pbvh->mesh->vdata, CD_PROP_BOOL, ".vert_hide");
+ pbvh->vert_hide = CustomData_get_layer_named(&pbvh->mesh->vdata, CD_PROP_BOOL, ".hide_vert");
if (pbvh->vert_hide) {
return pbvh->vert_hide;
}
pbvh->vert_hide = (bool *)CustomData_add_layer_named(
- &pbvh->mesh->vdata, CD_PROP_BOOL, CD_CALLOC, NULL, pbvh->mesh->totvert, ".vert_hide");
+ &pbvh->mesh->vdata, CD_PROP_BOOL, CD_CALLOC, NULL, pbvh->mesh->totvert, ".hide_vert");
return pbvh->vert_hide;
}
diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.c b/source/blender/blenkernel/intern/subdiv_converter_mesh.c
index 87e2f838b12..557f6a04761 100644
--- a/source/blender/blenkernel/intern/subdiv_converter_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.c
@@ -206,7 +206,7 @@ static void precalc_uv_layer(const OpenSubdiv_Converter *converter, const int la
}
UvVertMap *uv_vert_map = BKE_mesh_uv_vert_map_create(
mpoly,
- (const bool *)CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, ".face_hide"),
+ (const bool *)CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, ".hide_face"),
mloop,
mloopuv,
num_poly,
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.cc b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
index 038e4202ddd..6d3fcee2a8b 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert.cc
@@ -354,11 +354,11 @@ void BM_mesh_bm_from_me(BMesh *bm, const Mesh *me, const struct BMeshFromMeshPar
-1;
const bool *vert_hide = (const bool *)CustomData_get_layer_named(
- &me->vdata, CD_PROP_BOOL, ".vert_hide");
+ &me->vdata, CD_PROP_BOOL, ".hide_vert");
const bool *edge_hide = (const bool *)CustomData_get_layer_named(
- &me->edata, CD_PROP_BOOL, ".edge_hide");
+ &me->edata, CD_PROP_BOOL, ".hide_edge");
const bool *face_hide = (const bool *)CustomData_get_layer_named(
- &me->pdata, CD_PROP_BOOL, ".face_hide");
+ &me->pdata, CD_PROP_BOOL, ".hide_face");
Span<MVert> mvert{me->mvert, me->totvert};
Array<BMVert *> vtable(me->totvert);
@@ -1007,7 +1007,7 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh
mvert->flag = BM_vert_flag_to_mflag(v);
if (BM_elem_flag_test(v, BM_ELEM_HIDDEN)) {
- ensure_bool_layer(vert_hide, me->vdata, ".vert_hide", me->totvert);
+ ensure_bool_layer(vert_hide, me->vdata, ".hide_vert", me->totvert);
vert_hide[i] = true;
}
@@ -1035,7 +1035,7 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh
med->flag = BM_edge_flag_to_mflag(e);
if (BM_elem_flag_test(e, BM_ELEM_HIDDEN)) {
- ensure_bool_layer(edge_hide, me->edata, ".edge_hide", me->totedge);
+ ensure_bool_layer(edge_hide, me->edata, ".hide_edge", me->totedge);
edge_hide[i] = true;
}
@@ -1068,7 +1068,7 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh
mpoly->mat_nr = f->mat_nr;
mpoly->flag = BM_face_flag_to_mflag(f);
if (BM_elem_flag_test(f, BM_ELEM_HIDDEN)) {
- ensure_bool_layer(face_hide, me->pdata, ".face_hide", me->totpoly);
+ ensure_bool_layer(face_hide, me->pdata, "
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list