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:
authorHans Goudey <h.goudey@me.com>2021-09-19 09:20:06 +0300
committerHans Goudey <h.goudey@me.com>2021-09-19 09:20:06 +0300
commit257c7753e9beb2cbd34936766d5fc6c4dc441778 (patch)
tree25740bc3a3407ce49ac99739784216fbe91f0b91 /source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
parent69697fcca96178d53b57b14b5e4a39685a8378a1 (diff)
Cleanup: Rename curve node enums
The enum called "interpolate" was really a choice of methods for mapping inputs to positions on the curve, whereas the "sample" enum was used to define a way to create a whole set of new points from the curve, without any input parameters. The "re-sample" vs. "sample" naming makes that distinction better.
Diffstat (limited to 'source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc')
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
index 4ad311d63c5..f4dc03f1779 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
@@ -53,8 +53,7 @@ static void geo_node_curve_trim_init(bNodeTree *UNUSED(tree), bNode *node)
static void geo_node_curve_trim_update(bNodeTree *UNUSED(ntree), bNode *node)
{
const NodeGeometryCurveTrim &node_storage = *(NodeGeometryCurveTrim *)node->storage;
- const GeometryNodeCurveInterpolateMode mode = (GeometryNodeCurveInterpolateMode)
- node_storage.mode;
+ const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)node_storage.mode;
bNodeSocket *start_fac = ((bNodeSocket *)node->inputs.first)->next;
bNodeSocket *end_fac = start_fac->next;
@@ -324,8 +323,7 @@ static void trim_bezier_spline(Spline &spline,
static void geo_node_curve_trim_exec(GeoNodeExecParams params)
{
const NodeGeometryCurveTrim &node_storage = *(NodeGeometryCurveTrim *)params.node().storage;
- const GeometryNodeCurveInterpolateMode mode = (GeometryNodeCurveInterpolateMode)
- node_storage.mode;
+ const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)node_storage.mode;
GeometrySet geometry_set = params.extract_input<GeometrySet>("Curve");
geometry_set = bke::geometry_set_realize_instances(geometry_set);