Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc')
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
index e7a8c61290b..903a5e7c1d7 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
-#include "BKE_spline.hh"
+#include "BKE_curves.hh"
#include "BKE_curve_to_mesh.hh"
@@ -27,17 +27,18 @@ static void geometry_set_curve_to_mesh(GeometrySet &geometry_set,
const GeometrySet &profile_set,
const bool fill_caps)
{
- const std::unique_ptr<CurveEval> curve = curves_to_curve_eval(
- *geometry_set.get_curves_for_read());
+ const Curves &curves = *geometry_set.get_curves_for_read();
+
const Curves *profile_curves = profile_set.get_curves_for_read();
if (profile_curves == nullptr) {
- Mesh *mesh = bke::curve_to_wire_mesh(*curve);
+ Mesh *mesh = bke::curve_to_wire_mesh(bke::CurvesGeometry::wrap(curves.geometry));
geometry_set.replace_mesh(mesh);
}
else {
- const std::unique_ptr<CurveEval> profile_curve = curves_to_curve_eval(*profile_curves);
- Mesh *mesh = bke::curve_to_mesh_sweep(*curve, *profile_curve, fill_caps);
+ Mesh *mesh = bke::curve_to_mesh_sweep(bke::CurvesGeometry::wrap(curves.geometry),
+ bke::CurvesGeometry::wrap(profile_curves->geometry),
+ fill_caps);
geometry_set.replace_mesh(mesh);
}
}