[Bf-blender-cvs] [24839fdefa8] master: Cleanup: use "num" as a suffix in: source/blender/nodes
Campbell Barton
noreply at git.blender.org
Mon Mar 28 05:42:13 CEST 2022
Commit: 24839fdefa89339e77465c27d89c86cd5ac0cdd9
Author: Campbell Barton
Date: Mon Mar 28 11:16:16 2022 +1100
Branches: master
https://developer.blender.org/rB24839fdefa89339e77465c27d89c86cd5ac0cdd9
Cleanup: use "num" as a suffix in: source/blender/nodes
===================================================================
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
M source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
M source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
M source/blender/nodes/geometry/nodes/node_geo_transform.cc
===================================================================
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 99d7e15fa7a..73539bea8ee 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1189,7 +1189,7 @@ typedef struct NodeCryptomatte {
/** Legacy attributes */
/* Number of input sockets. */
- int num_inputs;
+ int inputs_num;
char _pad[4];
NodeCryptomatte_Runtime runtime;
diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h
index b2896c80db3..7ea8755412d 100644
--- a/source/blender/makesdna/intern/dna_rename_defs.h
+++ b/source/blender/makesdna/intern/dna_rename_defs.h
@@ -82,6 +82,7 @@ DNA_STRUCT_RENAME_ELEM(LineartGpencilModifierData, transparency_mask, material_m
DNA_STRUCT_RENAME_ELEM(MaskLayer, restrictflag, visibility_flag)
DNA_STRUCT_RENAME_ELEM(MaterialLineArt, transparency_mask, material_mask_bits)
DNA_STRUCT_RENAME_ELEM(MovieClip, name, filepath)
+DNA_STRUCT_RENAME_ELEM(NodeCryptomatte, num_inputs, inputs_num)
DNA_STRUCT_RENAME_ELEM(Object, col, color)
DNA_STRUCT_RENAME_ELEM(Object, dup_group, instance_collection)
DNA_STRUCT_RENAME_ELEM(Object, dupfacesca, instance_faces_scale)
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
index 162ef07a6dd..67d861aad9f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc
@@ -323,8 +323,8 @@ bNodeSocket *ntreeCompositCryptomatteAddSocket(bNodeTree *ntree, bNode *node)
BLI_assert(node->type == CMP_NODE_CRYPTOMATTE_LEGACY);
NodeCryptomatte *n = static_cast<NodeCryptomatte *>(node->storage);
char sockname[32];
- n->num_inputs++;
- BLI_snprintf(sockname, sizeof(sockname), "Crypto %.2d", n->num_inputs - 1);
+ n->inputs_num++;
+ BLI_snprintf(sockname, sizeof(sockname), "Crypto %.2d", n->inputs_num - 1);
bNodeSocket *sock = nodeAddStaticSocket(
ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, nullptr, sockname);
return sock;
@@ -334,12 +334,12 @@ int ntreeCompositCryptomatteRemoveSocket(bNodeTree *ntree, bNode *node)
{
BLI_assert(node->type == CMP_NODE_CRYPTOMATTE_LEGACY);
NodeCryptomatte *n = static_cast<NodeCryptomatte *>(node->storage);
- if (n->num_inputs < 2) {
+ if (n->inputs_num < 2) {
return 0;
}
bNodeSocket *sock = static_cast<bNodeSocket *>(node->inputs.last);
nodeRemoveSocket(ntree, node, sock);
- n->num_inputs--;
+ n->inputs_num--;
return 1;
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
index 6794671f707..4792fada98b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc
@@ -30,25 +30,25 @@ static Mesh *hull_from_bullet(const Mesh *mesh, Span<float3> coords)
{
plConvexHull hull = plConvexHullCompute((float(*)[3])coords.data(), coords.size());
- const int num_verts = plConvexHullNumVertices(hull);
- const int num_faces = num_verts <= 2 ? 0 : plConvexHullNumFaces(hull);
- const int num_loops = num_verts <= 2 ? 0 : plConvexHullNumLoops(hull);
+ const int verts_num = plConvexHullNumVertices(hull);
+ const int faces_num = verts_num <= 2 ? 0 : plConvexHullNumFaces(hull);
+ const int loops_num = verts_num <= 2 ? 0 : plConvexHullNumLoops(hull);
/* Half as many edges as loops, because the mesh is manifold. */
- const int num_edges = num_verts == 2 ? 1 : num_verts < 2 ? 0 : num_loops / 2;
+ const int edges_num = verts_num == 2 ? 1 : verts_num < 2 ? 0 : loops_num / 2;
/* Create Mesh *result with proper capacity. */
Mesh *result;
if (mesh) {
result = BKE_mesh_new_nomain_from_template(
- mesh, num_verts, num_edges, 0, num_loops, num_faces);
+ mesh, verts_num, edges_num, 0, loops_num, faces_num);
}
else {
- result = BKE_mesh_new_nomain(num_verts, num_edges, 0, num_loops, num_faces);
+ result = BKE_mesh_new_nomain(verts_num, edges_num, 0, loops_num, faces_num);
BKE_id_material_eval_ensure_default_slot(&result->id);
}
/* Copy vertices. */
- for (const int i : IndexRange(num_verts)) {
+ for (const int i : IndexRange(verts_num)) {
float co[3];
int original_index;
plConvexHullGetVertex(hull, i, co, &original_index);
@@ -73,9 +73,9 @@ static Mesh *hull_from_bullet(const Mesh *mesh, Span<float3> coords)
/* NOTE: ConvexHull from Bullet uses a half-edge data structure
* for its mesh. To convert that, each half-edge needs to be converted
* to a loop and edges need to be created from that. */
- Array<MLoop> mloop_src(num_loops);
+ Array<MLoop> mloop_src(loops_num);
uint edge_index = 0;
- for (const int i : IndexRange(num_loops)) {
+ for (const int i : IndexRange(loops_num)) {
int v_from;
int v_to;
plConvexHullGetLoop(hull, i, &v_from, &v_to);
@@ -95,7 +95,7 @@ static Mesh *hull_from_bullet(const Mesh *mesh, Span<float3> coords)
edge_index++;
}
}
- if (num_edges == 1) {
+ if (edges_num == 1) {
/* In this case there are no loops. */
MEdge &edge = result->medge[0];
edge.v1 = 0;
@@ -103,13 +103,13 @@ static Mesh *hull_from_bullet(const Mesh *mesh, Span<float3> coords)
edge.flag |= ME_EDGEDRAW | ME_EDGERENDER | ME_LOOSEEDGE;
edge_index++;
}
- BLI_assert(edge_index == num_edges);
+ BLI_assert(edge_index == edges_num);
/* Copy faces. */
Array<int> loops;
int j = 0;
MLoop *loop = result->mloop;
- for (const int i : IndexRange(num_faces)) {
+ for (const int i : IndexRange(faces_num)) {
const int len = plConvexHullGetFaceSize(hull, i);
BLI_assert(len > 2);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
index 81ca87eec25..95ea978541c 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
@@ -551,8 +551,8 @@ static std::unique_ptr<CurveEval> fillet_curve(const CurveEval &input_curve,
Span<SplinePtr> input_splines = input_curve.splines();
std::unique_ptr<CurveEval> output_curve = std::make_unique<CurveEval>();
- const int num_splines = input_splines.size();
- output_curve->resize(num_splines);
+ const int splines_num = input_splines.size();
+ output_curve->resize(splines_num);
MutableSpan<SplinePtr> output_splines = output_curve->splines();
Array<int> spline_offsets = input_curve.control_point_offsets();
diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
index cf6837817c2..c3b1a141f4a 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
@@ -168,12 +168,12 @@ static void copy_attributes_based_on_map(const Map<AttributeIDRef, AttributeKind
static void copy_face_corner_attributes(const Map<AttributeIDRef, AttributeKind> &attributes,
const GeometryComponent &in_component,
GeometryComponent &out_component,
- const int num_selected_loops,
+ const int selected_loops_num,
const Span<int> selected_poly_indices,
const Mesh &mesh_in)
{
Vector<int64_t> indices;
- indices.reserve(num_selected_loops);
+ indices.reserve(selected_loops_num);
for (const int src_poly_index : selected_poly_indices) {
const MPoly &src_poly = mesh_in.mpoly[src_poly_index];
const int src_loop_start = src_poly.loopstart;
@@ -546,47 +546,47 @@ static void separate_instance_selection(GeometrySet &geometry_set,
static void compute_selected_vertices_from_vertex_selection(const Span<bool> vertex_selection,
const bool invert,
MutableSpan<int> r_vertex_map,
- int *r_num_selected_vertices)
+ int *r_selected_vertices_num)
{
BLI_assert(vertex_selection.size() == r_vertex_map.size());
- int num_selected_vertices = 0;
+ int selected_verts_num = 0;
for (const int i : r_vertex_map.index_range()) {
if (vertex_selection[i] != invert) {
- r_vertex_map[i] = num_selected_vertices;
- num_selected_vertices++;
+ r_vertex_map[i] = selected_verts_num;
+ selected_verts_num++;
}
else {
r_vertex_map[i] = -1;
}
}
- *r_num_selected_vertices = num_selected_vertices;
+ *r_selected_vertices_num = selected_verts_num;
}
static void compute_selected_edges_from_vertex_selection(const Mesh &mesh,
const Span<bool> vertex_selection,
const bool invert,
MutableSpan<int> r_edge_map,
- int *r_num_selected_edges)
+ int *r_selected_edges_num)
{
BLI_assert(mesh.totedge == r_edge_map.size());
- int num_selected_edges = 0;
+ int selected_edges_num = 0;
for (const int i : IndexRange(mesh.totedge)) {
const MEdge &edge = mesh.medge[i];
/* Only add the edge if both vertices will be in the new mesh. */
if (vertex_selection[edge.v1] != invert && vertex_selection[edge.v2] != invert) {
- r_edge_map[i] = num_selected_edges;
- num_selected_edges++;
+ r_edge_map[i] = selected_edges_num;
+ selected_edges_num++;
}
else {
r_edge_map[i] = -1;
}
}
- *r_num_selected_edges = num_selected_edges;
+ *r_selected_edges_num = selected_edges_num;
}
static void compute_selected_polygons_from_vertex_selecti
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list