[Bf-blender-cvs] [c07be1e4841] soc-2021-curve-fillet: Change "Radii" attribute name to "Radius"
dilithjay
noreply at git.blender.org
Fri Sep 10 19:41:29 CEST 2021
Commit: c07be1e48412abedb112c9f687e318d7037790dc
Author: dilithjay
Date: Sat Sep 4 14:40:39 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rBc07be1e48412abedb112c9f687e318d7037790dc
Change "Radii" attribute name to "Radius"
===================================================================
M release/datafiles/locale
M release/scripts/addons
M source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 357d7f74796..326997b913d 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 357d7f74796f713a6d1e2d88297e38b5b4bd099c
+Subproject commit 326997b913d04bc5bc4656973d1e1a819f860dd2
diff --git a/release/scripts/addons b/release/scripts/addons
index 5d5b7489027..eecf14222b0 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 5d5b7489027a5c833e47af1f185ac28b401615e4
+Subproject commit eecf14222b0338d0d193648e1ede17bf48517e23
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 c7bb225e165..89957dc6a1a 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
@@ -30,8 +30,8 @@ static bNodeSocketTemplate geo_node_curve_fillet_in[] = {
{SOCK_FLOAT, N_("Angle"), M_PI_2, 0.0f, 0.0f, 0.0f, 0.001f, FLT_MAX, PROP_ANGLE},
{SOCK_INT, N_("Count"), 1, 0, 0, 0, 1, 1000},
{SOCK_BOOLEAN, N_("Limit Radius")},
- {SOCK_FLOAT, N_("Radii"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX, PROP_DISTANCE},
- {SOCK_STRING, N_("Radii")},
+ {SOCK_FLOAT, N_("Radius"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX, PROP_DISTANCE},
+ {SOCK_STRING, N_("Radius")},
{-1, ""},
};
@@ -106,7 +106,7 @@ static void geo_node_curve_fillet_update(bNodeTree *UNUSED(ntree), bNode *node)
nodeSetSocketAvailability(user_socket, mode == GEO_NODE_CURVE_FILLET_USER_DEFINED);
update_attribute_input_socket_availabilities(
- *node, "Radii", (GeometryNodeAttributeInputMode)node_storage.radius_mode);
+ *node, "Radius", (GeometryNodeAttributeInputMode)node_storage.radius_mode);
}
/* Function to get the center of a fillet. */
@@ -648,7 +648,7 @@ static void geo_node_fillet_exec(GeoNodeExecParams params)
std::unique_ptr<CurveEval> output_curve;
GVArray_Typed<float> radii_array = params.get_input_attribute<float>(
- "Radii", *geometry_set.get_component_for_read<CurveComponent>(), ATTR_DOMAIN_POINT, 0.0f);
+ "Radius", *geometry_set.get_component_for_read<CurveComponent>(), ATTR_DOMAIN_POINT, 0.0f);
if (radii_array->is_single() && radii_array->get_internal_single() < 0) {
params.set_output("Geometry", geometry_set);
diff --git a/source/tools b/source/tools
index 08de10dbd82..548055f4021 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 08de10dbd8234c242b1896a6813d2a6335288e74
+Subproject commit 548055f40213c775a6b77025525c91e8466e70d6
More information about the Bf-blender-cvs
mailing list