[Bf-blender-cvs] [a357adf6cdf] refactor-mesh-sharp-edge-generic: Remove dot from attribute name
Hans Goudey
noreply at git.blender.org
Thu Jan 5 06:01:08 CET 2023
Commit: a357adf6cdfc855d3e01c828e237ab2268b3fe71
Author: Hans Goudey
Date: Wed Jan 4 23:58:13 2023 -0500
Branches: refactor-mesh-sharp-edge-generic
https://developer.blender.org/rBa357adf6cdfc855d3e01c828e237ab2268b3fe71
Remove dot from attribute name
===================================================================
M source/blender/blenkernel/intern/curve_to_mesh_convert.cc
M source/blender/blenkernel/intern/customdata.cc
M source/blender/blenkernel/intern/data_transfer.cc
M source/blender/blenkernel/intern/geometry_component_mesh.cc
M source/blender/blenkernel/intern/key.cc
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_legacy_convert.cc
M source/blender/blenkernel/intern/mesh_mirror.cc
M source/blender/blenkernel/intern/mesh_normals.cc
M source/blender/blenkernel/intern/mesh_remap.cc
M source/blender/bmesh/intern/bmesh_mesh_convert.cc
M source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc
M source/blender/editors/mesh/mesh_data.cc
M source/blender/editors/sculpt_paint/sculpt_face_set.cc
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc
M source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_mesh_api.c
M source/blender/modifiers/intern/MOD_normal_edit.cc
M source/blender/modifiers/intern/MOD_weighted_normal.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc
index fc9da6b7e6c..011646ffd19 100644
--- a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc
+++ b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc
@@ -633,8 +633,7 @@ static void write_sharp_bezier_edges(const CurvesInfo &curves_info,
return;
}
- sharp_edges = mesh_attributes.lookup_or_add_for_write_span<bool>(".sharp_edge",
- ATTR_DOMAIN_EDGE);
+ sharp_edges = mesh_attributes.lookup_or_add_for_write_span<bool>("sharp_edge", ATTR_DOMAIN_EDGE);
const VArray<int8_t> types = profile.curve_types();
foreach_curve_combination(curves_info, offsets, [&](const CombinationInfo &info) {
@@ -722,7 +721,7 @@ Mesh *curve_to_mesh_sweep(const CurvesGeometry &main,
write_sharp_bezier_edges(curves_info, offsets, mesh_attributes, sharp_edges);
if (fill_caps) {
if (!sharp_edges) {
- sharp_edges = mesh_attributes.lookup_or_add_for_write_span<bool>(".sharp_edge",
+ sharp_edges = mesh_attributes.lookup_or_add_for_write_span<bool>("sharp_edge",
ATTR_DOMAIN_EDGE);
}
foreach_curve_combination(curves_info, offsets, [&](const CombinationInfo &info) {
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index b1007b33891..2abb2d449df 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -2379,7 +2379,7 @@ static bool attribute_stored_in_bmesh_flag(const StringRef name)
".select_edge",
".select_poly",
"material_index",
- ".sharp_edge");
+ "sharp_edge");
}
CustomData CustomData_shallow_copy_remove_non_bmesh_attributes(const CustomData *src,
diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc
index 844fdef036f..7e56cd966f5 100644
--- a/source/blender/blenkernel/intern/data_transfer.cc
+++ b/source/blender/blenkernel/intern/data_transfer.cc
@@ -302,7 +302,7 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src,
use_split_nors_dst,
split_angle_dst,
static_cast<const bool *>(CustomData_get_layer_named(
- &me_dst->edata, CD_PROP_BOOL, ".sharp_edge")),
+ &me_dst->edata, CD_PROP_BOOL, "sharp_edge")),
nullptr,
nullptr,
custom_nors_dst);
@@ -347,7 +347,7 @@ static void data_transfer_dtdata_type_postprocess(Object * /*ob_src*/,
bke::MutableAttributeAccessor attributes = me_dst->attributes_for_write();
bke::SpanAttributeWriter<bool> sharp_edges = attributes.lookup_or_add_for_write_span<bool>(
- ".sharp_edge", ATTR_DOMAIN_EDGE);
+ "sharp_edge", ATTR_DOMAIN_EDGE);
/* Note loop_nors_dst contains our custom normals as transferred from source... */
BKE_mesh_normals_loop_custom_set(verts_dst,
@@ -996,9 +996,9 @@ static bool data_transfer_layersmapping_generate(ListBase *r_map,
return true;
}
if (r_map && cddata_type == CD_FAKE_SHARP) {
- if (!CustomData_get_layer_named(&me_dst->edata, CD_PROP_BOOL, ".sharp_edge")) {
+ if (!CustomData_get_layer_named(&me_dst->edata, CD_PROP_BOOL, "sharp_edge")) {
CustomData_add_layer_named(
- &me_dst->edata, CD_PROP_BOOL, CD_SET_DEFAULT, nullptr, me_dst->totedge, ".sharp_edge");
+ &me_dst->edata, CD_PROP_BOOL, CD_SET_DEFAULT, nullptr, me_dst->totedge, "sharp_edge");
}
data_transfer_layersmapping_add_item_cd(
r_map,
@@ -1006,8 +1006,8 @@ static bool data_transfer_layersmapping_generate(ListBase *r_map,
mix_mode,
mix_factor,
mix_weights,
- CustomData_get_layer_named(&me_src->edata, CD_PROP_BOOL, ".sharp_edge"),
- CustomData_get_layer_named(&me_dst->edata, CD_PROP_BOOL, ".sharp_edge"),
+ CustomData_get_layer_named(&me_src->edata, CD_PROP_BOOL, "sharp_edge"),
+ CustomData_get_layer_named(&me_dst->edata, CD_PROP_BOOL, "sharp_edge"),
interp,
interp_data);
return true;
diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc
index 6c126c94945..74a2e599baf 100644
--- a/source/blender/blenkernel/intern/geometry_component_mesh.cc
+++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc
@@ -1297,7 +1297,7 @@ static ComponentAttributeProviders create_attribute_providers_for_mesh()
make_derived_write_attribute<MPoly, bool, get_shade_smooth, set_shade_smooth>,
nullptr);
- static BuiltinCustomDataLayerProvider sharp_edge(".sharp_edge",
+ static BuiltinCustomDataLayerProvider sharp_edge("sharp_edge",
ATTR_DOMAIN_EDGE,
CD_PROP_BOOL,
CD_PROP_BOOL,
diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index 14e0a8701f4..5487295290c 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -2302,7 +2302,7 @@ void BKE_keyblock_mesh_calc_normals(const KeyBlock *kb,
(mesh->flag & ME_AUTOSMOOTH) != 0,
mesh->smoothresh,
static_cast<const bool *>(CustomData_get_layer_named(
- &mesh->edata, CD_PROP_BOOL, ".sharp_edge")),
+ &mesh->edata, CD_PROP_BOOL, "sharp_edge")),
nullptr,
nullptr,
clnors);
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 12fc7f0707a..76ad468a2a4 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -1854,7 +1854,7 @@ void BKE_mesh_calc_normals_split_ex(Mesh *mesh,
use_split_normals,
split_angle,
static_cast<const bool *>(CustomData_get_layer_named(
- &mesh->edata, CD_PROP_BOOL, ".sharp_edge")),
+ &mesh->edata, CD_PROP_BOOL, "sharp_edge")),
nullptr,
r_lnors_spacearr,
clnors);
diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
index eb1802340d5..af3fc3b4e27 100644
--- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc
@@ -1341,7 +1341,7 @@ void BKE_mesh_sharp_edges_to_flags(Mesh *mesh)
using namespace blender;
MutableSpan<MEdge> edges = mesh->edges_for_write();
if (const bool *sharp_edges = static_cast<const bool *>(
- CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, ".sharp_edge"))) {
+ CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, "sharp_edge"))) {
threading::parallel_for(edges.index_range(), 4096, [&](const IndexRange range) {
for (const int i : range) {
SET_FLAG_FROM_TEST(edges[i].flag, sharp_edges[i], ME_SHARP);
@@ -1364,7 +1364,7 @@ void BKE_mesh_sharp_edges_from_flags(Mesh *mesh)
if (std::any_of(
edges.begin(), edges.end(), [](const MEdge &edge) { return edge.flag & ME_SHARP; })) {
SpanAttributeWriter<bool> sharp_edges = attributes.lookup_or_add_for_write_only_span<bool>(
- ".sharp_edge", ATTR_DOMAIN_EDGE);
+ "sharp_edge", ATTR_DOMAIN_EDGE);
threading::parallel_for(edges.index_range(), 4096, [&](const IndexRange range) {
for (const int i : range) {
sharp_edges.span[i] = edges[i].flag & ME_SHARP;
diff --git a/source/blender/blenkernel/intern/mesh_mirror.cc b/source/blender/blenkernel/intern/mesh_mirror.cc
index 57385f0bbc9..dfc58114789 100644
--- a/source/blender/blenkernel/intern/mesh_mirror.cc
+++ b/source/blender/blenkernel/intern/mesh_mirror.cc
@@ -418,7 +418,7 @@ Mesh *BKE_mesh_mirror_apply_mirror_on_axis_for_modifier(MirrorModifierData *mmd,
true,
mesh->smoothresh,
static_cast<const bool *>(CustomData_get_layer_named(
- &result->edata, CD_PROP_BOOL, ".sharp_edge")),
+ &result->edata, CD_PROP_BOOL, "sharp_edge")),
nullptr,
&lnors_spacearr,
clnors);
diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc
index 9ac49a0c872..109bbbeb042 100644
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@@ -1976,7 +1976,7 @@ static void mesh_set_custom_normals(Mesh *mesh, float (*r_custom_nors)[3], const
const Span<MLoop> loops = mesh->loops();
MutableAttributeAccessor attributes = mesh->attributes_for_write();
SpanAttributeWriter<bool> sharp_edges = attributes.lookup_or_add_for_write_span<bool>(
- ".sharp_edge", ATTR_DOMAIN_EDGE);
+ "sharp_edge", ATTR_DOMAIN_EDGE);
mesh_normals_loop_custom_set(verts.data(),
BKE_mesh_vertex_normals_ensure(mesh),
diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc
index a28201dac48..5ef6301496e 100644
--- a/source/blender/blenkernel/intern/mesh_remap.cc
+++ b/source/blender/blenkernel/intern/mesh_remap.cc
@@ -1381,7 +1381,7 @@ void BKE_mesh_remap_calc_loo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list