diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-09-20 02:59:01 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-09-20 02:59:01 +0300 |
| commit | c9e835fec1bcd8ae42b57feaefaa6f4d946f546f (patch) | |
| tree | 5046f9239863c3bb4b5792e66b0855d96e79a51a /source | |
| parent | 25aa943e8cb8d5a33beb906207255e5d0ea08544 (diff) | |
Fix build error after previous commit
Incorrect renaming and use of enum after search and replace.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 2 | ||||
| -rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 39af3650558..f4c88333528 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -2046,7 +2046,7 @@ typedef enum GeometryNodeCurveResampleMode { typedef enum GeometryNodeCurveSampleMode { GEO_NODE_CURVE_SAMPLE_FACTOR = 0, - GEO_NODE_CURVE_RESAMPLE_LENGTH = 1, + GEO_NODE_CURVE_SAMPLE_LENGTH = 1, } GeometryNodeCurveSampleMode; typedef enum GeometryNodeAttributeTransferMapMode { 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 d2217656e20..a90a7665ec7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc @@ -62,8 +62,8 @@ static void geo_node_curve_trim_update(bNodeTree *UNUSED(ntree), bNode *node) nodeSetSocketAvailability(start_fac, mode == GEO_NODE_CURVE_SAMPLE_FACTOR); nodeSetSocketAvailability(end_fac, mode == GEO_NODE_CURVE_SAMPLE_FACTOR); - nodeSetSocketAvailability(start_len, mode == GEO_NODE_CURVE_RESAMPLE_LENGTH); - nodeSetSocketAvailability(end_len, mode == GEO_NODE_CURVE_RESAMPLE_LENGTH); + nodeSetSocketAvailability(start_len, mode == GEO_NODE_CURVE_SAMPLE_LENGTH); + nodeSetSocketAvailability(end_len, mode == GEO_NODE_CURVE_SAMPLE_LENGTH); } struct TrimLocation { @@ -359,11 +359,11 @@ static void geo_node_curve_trim_exec(GeoNodeExecParams params) } const Spline::LookupResult start_lookup = - (mode == GEO_NODE_CURVE_RESAMPLE_LENGTH) ? + (mode == GEO_NODE_CURVE_SAMPLE_LENGTH) ? spline.lookup_evaluated_length(std::clamp(start, 0.0f, spline.length())) : spline.lookup_evaluated_factor(std::clamp(start, 0.0f, 1.0f)); const Spline::LookupResult end_lookup = - (mode == GEO_NODE_CURVE_RESAMPLE_LENGTH) ? + (mode == GEO_NODE_CURVE_SAMPLE_LENGTH) ? spline.lookup_evaluated_length(std::clamp(end, 0.0f, spline.length())) : spline.lookup_evaluated_factor(std::clamp(end, 0.0f, 1.0f)); |