[Bf-blender-cvs] [2ada25e5870] refactor-mesh-position-generic: Renamings
Hans Goudey
noreply at git.blender.org
Fri Sep 23 20:27:35 CEST 2022
Commit: 2ada25e58706c64e10a690f062a65029b8f62ce8
Author: Hans Goudey
Date: Fri Sep 23 09:35:10 2022 -0500
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB2ada25e58706c64e10a690f062a65029b8f62ce8
Renamings
===================================================================
M source/blender/blenkernel/BKE_mesh_mapping.h
M source/blender/blenkernel/intern/attribute_access.cc
M source/blender/blenkernel/intern/customdata.cc
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_calc_edges.cc
M source/blender/blenkernel/intern/mesh_evaluate.cc
M source/blender/blenkernel/intern/mesh_legacy_convert.cc
M source/blender/blenkernel/intern/mesh_mapping.cc
M source/blender/blenkernel/intern/object_deform.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.cc
M source/blender/draw/intern/draw_cache_impl_subdivision.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh.hh
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc
M source/blender/editors/armature/armature_skinning.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/mesh/editface.cc
M source/blender/editors/mesh/mesh_data.cc
M source/blender/editors/object/object_modifier.cc
M source/blender/editors/object/object_vgroup.cc
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_vertex.cc
M source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc
M source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
M source/blender/editors/space_view3d/view3d_select.cc
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesrna/intern/rna_mesh.c
M tests/python/modules/mesh_test.py
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index 60ef4825f88..2ee50fbaaee 100644
--- a/source/blender/blenkernel/BKE_mesh_mapping.h
+++ b/source/blender/blenkernel/BKE_mesh_mapping.h
@@ -93,7 +93,7 @@ typedef struct MeshElemMap {
/* mapping */
UvVertMap *BKE_mesh_uv_vert_map_create(const struct MPoly *mpoly,
const bool *hide_poly,
- const bool *selection_poly,
+ const bool *select_poly,
const struct MLoop *mloop,
const struct MLoopUV *mloopuv,
unsigned int totpoly,
diff --git a/source/blender/blenkernel/intern/attribute_access.cc b/source/blender/blenkernel/intern/attribute_access.cc
index df7787986db..b86353bdb74 100644
--- a/source/blender/blenkernel/intern/attribute_access.cc
+++ b/source/blender/blenkernel/intern/attribute_access.cc
@@ -58,7 +58,7 @@ const char *no_procedural_access_message =
bool allow_procedural_attribute_access(StringRef attribute_name)
{
- return !attribute_name.startswith(".sculpt") && !attribute_name.startswith(".selection") &&
+ return !attribute_name.startswith(".sculpt") && !attribute_name.startswith(".select") &&
!attribute_name.startswith(".hide");
}
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index 55d3797cd5d..51c3b405ebc 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -2376,9 +2376,9 @@ static bool attribute_stored_in_bmesh_flag(const StringRef name)
".hide_vert",
".hide_edge",
".hide_poly",
- ".selection_vert",
- ".selection_edge",
- ".selection_poly",
+ ".select_vert",
+ ".select_edge",
+ ".select_poly",
"material_index");
}
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 336c41c8e10..6df6cd31cf4 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -259,9 +259,9 @@ static void mesh_blend_write(BlendWriter *writer, ID *id, const void *id_address
".hide_edge",
".hide_poly",
"material_index",
- ".selection_vert",
- ".selection_edge",
- ".selection_poly"});
+ ".select_vert",
+ ".select_edge",
+ ".select_poly"});
/* Set deprecated mesh data pointers for forward compatibility. */
mesh->mvert = const_cast<MVert *>(mesh->verts().data());
@@ -697,11 +697,6 @@ static int customdata_compare(
case CD_PROP_BOOL: {
const bool *l1_data = (bool *)l1->data;
const bool *l2_data = (bool *)l2->data;
- /* TODO(@HooglyBoogly): Remove this after test files have been updated for selection
- * attribute changes. */
- if (StringRef(l1->name).startswith(".selection")) {
- continue;
- }
for (int i = 0; i < total_length; i++) {
if (l1_data[i] != l2_data[i]) {
return MESHCMP_ATTRIBUTE_VALUE_MISMATCH;
@@ -1664,32 +1659,32 @@ void BKE_mesh_mselect_validate(Mesh *me)
(me->totselect), sizeof(MSelect), "Mesh selection history");
const AttributeAccessor attributes = me->attributes();
- const VArray<bool> selection_vert = attributes.lookup_or_default<bool>(
- ".selection_vert", ATTR_DOMAIN_POINT, false);
- const VArray<bool> selection_edge = attributes.lookup_or_default<bool>(
- ".selection_edge", ATTR_DOMAIN_EDGE, false);
- const VArray<bool> selection_poly = attributes.lookup_or_default<bool>(
- ".selection_poly", ATTR_DOMAIN_FACE, false);
+ const VArray<bool> select_vert = attributes.lookup_or_default<bool>(
+ ".select_vert", ATTR_DOMAIN_POINT, false);
+ const VArray<bool> select_edge = attributes.lookup_or_default<bool>(
+ ".select_edge", ATTR_DOMAIN_EDGE, false);
+ const VArray<bool> select_poly = attributes.lookup_or_default<bool>(
+ ".select_poly", ATTR_DOMAIN_FACE, false);
for (i_src = 0, i_dst = 0; i_src < me->totselect; i_src++) {
int index = mselect_src[i_src].index;
switch (mselect_src[i_src].type) {
case ME_VSEL: {
- if (selection_vert[index]) {
+ if (select_vert[index]) {
mselect_dst[i_dst] = mselect_src[i_src];
i_dst++;
}
break;
}
case ME_ESEL: {
- if (selection_edge[index]) {
+ if (select_edge[index]) {
mselect_dst[i_dst] = mselect_src[i_src];
i_dst++;
}
break;
}
case ME_FSEL: {
- if (selection_poly[index]) {
+ if (select_poly[index]) {
mselect_dst[i_dst] = mselect_src[i_src];
i_dst++;
}
diff --git a/source/blender/blenkernel/intern/mesh_calc_edges.cc b/source/blender/blenkernel/intern/mesh_calc_edges.cc
index 06bfce65efc..038133c33ae 100644
--- a/source/blender/blenkernel/intern/mesh_calc_edges.cc
+++ b/source/blender/blenkernel/intern/mesh_calc_edges.cc
@@ -247,19 +247,19 @@ void BKE_mesh_calc_edges(Mesh *mesh, bool keep_existing_edges, const bool select
if (select_new_edges) {
MutableAttributeAccessor attributes = mesh->attributes_for_write();
- SpanAttributeWriter<bool> selection_edge = attributes.lookup_or_add_for_write_span<bool>(
- ".selection_edge", ATTR_DOMAIN_EDGE);
- if (selection_edge) {
+ SpanAttributeWriter<bool> select_edge = attributes.lookup_or_add_for_write_span<bool>(
+ ".select_edge", ATTR_DOMAIN_EDGE);
+ if (select_edge) {
int new_edge_index = 0;
for (const EdgeMap &edge_map : edge_maps) {
for (EdgeMap::Item item : edge_map.items()) {
if (item.value.original_edge == nullptr) {
- selection_edge.span[new_edge_index] = true;
+ select_edge.span[new_edge_index] = true;
}
new_edge_index++;
}
}
- selection_edge.finish();
+ select_edge.finish();
}
}
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.cc b/source/blender/blenkernel/intern/mesh_evaluate.cc
index 15ea5357dee..4f8391263a1 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.cc
+++ b/source/blender/blenkernel/intern/mesh_evaluate.cc
@@ -822,27 +822,27 @@ void BKE_mesh_flush_select_from_polys(Mesh *me)
{
using namespace blender::bke;
MutableAttributeAccessor attributes = me->attributes_for_write();
- const VArray<bool> selection_poly = attributes.lookup_or_default<bool>(
- ".selection_poly", ATTR_DOMAIN_FACE, false);
- if (selection_poly.is_single() && !selection_poly.get_internal_single()) {
- attributes.remove(".selection_vert");
- attributes.remove(".selection_edge");
+ const VArray<bool> select_poly = attributes.lookup_or_default<bool>(
+ ".select_poly", ATTR_DOMAIN_FACE, false);
+ if (select_poly.is_single() && !select_poly.get_internal_single()) {
+ attributes.remove(".select_vert");
+ attributes.remove(".select_edge");
return;
}
- SpanAttributeWriter<bool> selection_vert = attributes.lookup_or_add_for_write_only_span<bool>(
- ".selection_vert", ATTR_DOMAIN_POINT);
- SpanAttributeWriter<bool> selection_edge = attributes.lookup_or_add_for_write_only_span<bool>(
- ".selection_edge", ATTR_DOMAIN_EDGE);
+ SpanAttributeWriter<bool> select_vert = attributes.lookup_or_add_for_write_only_span<bool>(
+ ".select_vert", ATTR_DOMAIN_POINT);
+ SpanAttributeWriter<bool> select_edge = attributes.lookup_or_add_for_write_only_span<bool>(
+ ".select_edge", ATTR_DOMAIN_EDGE);
/* Use generic domain interpolation to read the polygon attribute on the other domains.
* Assume selected faces are not hidden and none of their vertices/edges are hidden. */
- attributes.lookup_or_default<bool>(".selection_poly", ATTR_DOMAIN_POINT, false)
- .materialize(selection_vert.span);
- attributes.lookup_or_default<bool>(".selection_poly", ATTR_DOMAIN_EDGE, false)
- .materialize(selection_edge.span);
+ attributes.lookup_or_default<bool>(".select_poly", ATTR_DOMAIN_POINT, false)
+ .materialize(select_vert.span);
+ attributes.lookup_or_default<bool>(".select_poly", ATTR_DOMAIN_EDGE, false)
+ .materialize(select_edge.span);
- selection_vert.finish();
- selection_edge.finish();
+ select_vert.finish();
+ select_edge.finish();
}
static void mesh_flush_select_from_verts(const Span<MEdge> edges,
@@ -850,15 +850,15 @@ static void mesh_flush_select_from_verts(const Span<MEdge> edges,
const Span<MLoop> loops,
const VArray<bool> &hide_edge,
const VArray<bool> &hide_poly,
- const VArray<bool> &selection_vert,
- MutableSpan<bool> selection_edge,
- MutableSpan<bool> selection_poly)
+ const VArray<bool> &select_vert,
+ MutableSpan<bool> select_edge,
+ MutableSpan<bool> select_poly)
{
/* Select visible edges that have both of their vertices selected. */
for (const int i : edges.index_range()) {
if (!hide_edge[i]) {
const MEdge &edge = edges[i];
- selection_edge[i] = selection_vert[edge.v1] && selection_vert[edge.v2];
+ select_edge[i] = select_vert[edge.v1] && select_vert[edge.v2];
}
}
@@ -867,9 +867,9 @@ static void mesh_flush_select_from_verts(const Span<MEdge> edges,
if (!hide_poly[i]) {
const MPoly &poly = polys[i];
const S
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list