1 files changed, 36 insertions, 31 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc
index ae4453929ac..eef8c1b0db5 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc
@@ -23,23 +23,23 @@
 
 #include "node_geometry_util.hh"
 
-namespace blender::nodes {
+namespace blender::nodes::node_geo_curve_spline_type_cc {
 
-static void geo_node_curve_spline_type_declare(NodeDeclarationBuilder &b)
+NODE_STORAGE_FUNCS(NodeGeometryCurveSplineType)
+
+static void node_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Geometry>(N_("Curve")).supported_type(GEO_COMPONENT_TYPE_CURVE);
   b.add_input<decl::Bool>(N_("Selection")).default_value(true).hide_value().supports_field();
   b.add_output<decl::Geometry>(N_("Curve"));
 }
 
-static void geo_node_curve_spline_type_layout(uiLayout *layout,
-                                              bContext *UNUSED(C),
-                                              PointerRNA *ptr)
+static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
   uiItemR(layout, ptr, "spline_type", 0, "", ICON_NONE);
 }
 
-static void geo_node_curve_spline_type_init(bNodeTree *UNUSED(tree), bNode *node)
+static void node_init(bNodeTree *UNUSED(tree), bNode *node)
 {
   NodeGeometryCurveSplineType *data = (NodeGeometryCurveSplineType *)MEM_callocN(
       sizeof(NodeGeometryCurveSplineType), __func__);
@@ -238,11 +238,10 @@ static SplinePtr convert_to_nurbs(const Spline &input)
   return {};
 }
 
-static void geo_node_curve_spline_type_exec(GeoNodeExecParams params)
+static void node_geo_exec(GeoNodeExecParams params)
 {
-  const NodeGeometryCurveSplineType *storage =
-      (const NodeGeometryCurveSplineType *)params.node().storage;
-  const GeometryNodeSplineType output_type = (const GeometryNodeSplineType)storage->spline_type;
+  const NodeGeometryCurveSplineType &storage = node_storage(params.node());
+  const GeometryNodeSplineType output_type = (const GeometryNodeSplineType)storage.spline_type;
 
   GeometrySet geometry_set = params.extract_input<GeometrySet>("Curve");
   Field<bool> selection_field = params.extract_input<Field<bool>>("Selection");
@@ -263,24 +262,28 @@ static void geo_node_curve_spline_type_exec(GeoNodeExecParams params)
     const VArray<bool> &selection = selection_evaluator.get_evaluated<bool>(0);
 
     std::unique_ptr<CurveEval> new_curve = std::make_unique<CurveEval>();
-    for (const int i : curve.splines().index_range()) {
-      if (selection[i]) {
-        switch (output_type) {
-          case GEO_NODE_SPLINE_TYPE_POLY:
-            new_curve->add_spline(convert_to_poly_spline(*curve.splines()[i]));
-            break;
-          case GEO_NODE_SPLINE_TYPE_BEZIER:
-            new_curve->add_spline(convert_to_bezier(*curve.splines()[i], params));
-            break;
-          case GEO_NODE_SPLINE_TYPE_NURBS:
-            new_curve->add_spline(convert_to_nurbs(*curve.splines()[i]));
-            break;
+    new_curve->resize(curve.splines().size());
+
+    threading::parallel_for(curve.splines().index_range(), 512, [&](IndexRange range) {
+      for (const int i : range) {
+        if (selection[i]) {
+          switch (output_type) {
+            case GEO_NODE_SPLINE_TYPE_POLY:
+              new_curve->splines()[i] = convert_to_poly_spline(*curve.splines()[i]);
+              break;
+            case GEO_NODE_SPLINE_TYPE_BEZIER:
+              new_curve->splines()[i] = convert_to_bezier(*curve.splines()[i], params);
+              break;
+            case GEO_NODE_SPLINE_TYPE_NURBS:
+              new_curve->splines()[i] = convert_to_nurbs(*curve.splines()[i]);
+              break;
+          }
+        }
+        else {
+          new_curve->splines()[i] = curve.splines()[i]->copy();
         }
       }
-      else {
-        new_curve->add_spline(curve.splines()[i]->copy());
-      }
-    }
+    });
     new_curve->attributes = curve.attributes;
     geometry_set.replace_curve(new_curve.release());
   });
@@ -288,21 +291,23 @@ static void geo_node_curve_spline_type_exec(GeoNodeExecParams params)
   params.set_output("Curve", std::move(geometry_set));
 }
 
-}  // namespace blender::nodes
+}  // namespace blender::nodes::node_geo_curve_spline_type_cc
 
 void register_node_type_geo_curve_spline_type()
 {
+  namespace file_ns = blender::nodes::node_geo_curve_spline_type_cc;
+
   static bNodeType ntype;
   geo_node_type_base(
       &ntype, GEO_NODE_CURVE_SPLINE_TYPE, "Set Spline Type", NODE_CLASS_GEOMETRY, 0);
-  ntype.declare = blender::nodes::geo_node_curve_spline_type_declare;
-  ntype.geometry_node_execute = blender::nodes::geo_node_curve_spline_type_exec;
-  node_type_init(&ntype, blender::nodes::geo_node_curve_spline_type_init);
+  ntype.declare = file_ns::node_declare;
+  ntype.geometry_node_execute = file_ns::node_geo_exec;
+  node_type_init(&ntype, file_ns::node_init);
   node_type_storage(&ntype,
                     "NodeGeometryCurveSplineType",
                     node_free_standard_storage,
                     node_copy_standard_storage);
-  ntype.draw_buttons = blender::nodes::geo_node_curve_spline_type_layout;
+  ntype.draw_buttons = file_ns::node_layout;
 
   nodeRegisterType(&ntype);
 }