[Bf-blender-cvs] [cbdda7c82fc] soc-2021-curve-fillet: Made changes according to revision
dilithjay
noreply at git.blender.org
Mon Sep 20 06:20:51 CEST 2021
Commit: cbdda7c82fcbbf9a8abdf0f38f24551640ac19f8
Author: dilithjay
Date: Tue Sep 14 13:43:01 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rBcbdda7c82fcbbf9a8abdf0f38f24551640ac19f8
Made changes according to revision
===================================================================
M release/datafiles/locale
M release/scripts/addons
M source/blender/makesrna/intern/rna_nodetree.c
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 4d67fb6e277..94c39b5832b 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 4d67fb6e2773619392b3d2099188ae742ef9662a
+Subproject commit 94c39b5832b9ef3b56ed94ce4011412e3d776eb2
diff --git a/release/scripts/addons b/release/scripts/addons
index 32baafe44dc..b917c64d9b1 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 32baafe44dc56edd1baf6e5a16b4439ded8238f2
+Subproject commit b917c64d9b1a007a96d476e37dcf60c733ffc689
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 559f663bd03..65081aceff2 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -10140,7 +10140,7 @@ static void def_geo_curve_fillet(StructRNA *srna)
"BEZIER",
0,
"Bezier",
- "Set Bezier align handles to create an arc as perfectly circular as possible."},
+ "Align Bezier handles to create circular arcs at each control point"},
{GEO_NODE_CURVE_FILLET_POLY,
"POLY",
0,
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 0ba410a0e82..2a8a12bae77 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
@@ -30,11 +30,14 @@ namespace blender::nodes {
static void geo_node_curve_fillet_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Geometry>("Curve");
- b.add_input<decl::Int>("Poly Count").default_value(1).min(1).max(1000);
- b.add_input<decl::Bool>("Limit Radius");
- b.add_input<decl::Float>("Radius").min(0.0f).max(FLT_MAX).subtype(
- PropertySubType::PROP_DISTANCE);
+ b.add_input<decl::Int>("Count").default_value(1).min(1).max(1000);
+ b.add_input<decl::Float>("Radius")
+ .min(0.0f)
+ .max(FLT_MAX)
+ .subtype(PropertySubType::PROP_DISTANCE)
+ .default_value(0.2f);
b.add_input<decl::String>("Radius");
+ b.add_input<decl::Bool>("Limit Radius");
b.add_output<decl::Geometry>("Curve");
}
@@ -618,7 +621,7 @@ static void geo_node_fillet_exec(GeoNodeExecParams params)
fillet_param.mode = mode;
if (mode == GEO_NODE_CURVE_FILLET_POLY) {
- Field<int> count_field = params.extract_input<Field<int>>("Poly Count");
+ Field<int> count_field = params.extract_input<Field<int>>("Count");
GeometryComponent &component = geometry_set.get_component_for_write(GEO_COMPONENT_TYPE_CURVE);
GeometryComponentFieldContext field_context{component, ATTR_DOMAIN_POINT};
const int domain_size = component.attribute_domain_size(ATTR_DOMAIN_POINT);
diff --git a/source/tools b/source/tools
index 548055f4021..723b24841df 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 548055f40213c775a6b77025525c91e8466e70d6
+Subproject commit 723b24841df1ed8478949bca20c73878fab00dca
More information about the Bf-blender-cvs
mailing list