diff options
author | Hans Goudey <h.goudey@me.com> | 2022-02-23 06:15:03 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-02-23 06:15:03 +0300 |
commit | 06bc20f61a8289d612ea985e45a372721d66ccb1 (patch) | |
tree | 692f1b8ff927fee15a5494273d932e6218c92883 /source/blender/nodes/geometry/nodes | |
parent | f3ef0763b41155e6234343de900b207bb5b2e20d (diff) |
Fix: Errors in previous cleanup commit
f3ef0763b41155e623 introduced a file by mistake, and didn't add
a new enum type to many switch cases. Sorry for the noise.
Diffstat (limited to 'source/blender/nodes/geometry/nodes')
10 files changed, 48 insertions, 0 deletions
diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_spline_type.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_spline_type.cc index 0826a78b2b9..87b8bbf8786 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_spline_type.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_spline_type.cc @@ -202,6 +202,10 @@ static SplinePtr convert_to_bezier(const Spline &input, GeoNodeExecParams params } return nurbs_to_bezier(input); } + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + return {}; + } } BLI_assert_unreachable(); return {}; @@ -216,6 +220,9 @@ static SplinePtr convert_to_nurbs(const Spline &input) return bezier_to_nurbs(input); case CURVE_TYPE_POLY: return poly_to_nurbs(input); + case CURVE_TYPE_CATMULL_ROM: + BLI_assert_unreachable(); + return {}; } BLI_assert_unreachable(); return {}; diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_subdivide.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_subdivide.cc index 06f0e633e40..bce320496a1 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_subdivide.cc @@ -255,6 +255,10 @@ static void subdivide_builtin_attributes(const Spline &src_spline, subdivide_attribute<float>(src.weights(), offsets, is_cyclic, dst.weights()); break; } + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + break; + } } } diff --git a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_delete_geometry.cc b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_delete_geometry.cc index 3dc40639627..897a1c1cd2d 100644 --- a/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_delete_geometry.cc @@ -128,6 +128,10 @@ static void spline_copy_builtin_attributes(const Spline &spline, copy_data(src.weights(), dst.weights(), mask); break; } + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + break; + } } } 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 ef402d41268..b8f317a9679 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc @@ -536,6 +536,10 @@ static SplinePtr fillet_spline(const Spline &spline, update_poly_positions(fd, dst_spline, src_spline, point_counts); break; } + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + break; + } } return dst_spline_ptr; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc index f4343965d66..3fcbd1b88c3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc @@ -112,6 +112,10 @@ static Array<float> curve_length_point_domain(const CurveEval &curve) calculate_nurbs_lengths(static_cast<const NURBSpline &>(spline), spline_factors); break; } + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + break; + } } } }); 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 c79d1da8b6c..053df030f15 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 @@ -327,6 +327,10 @@ static SplinePtr convert_to_bezier(const Spline &input, GeoNodeExecParams params return input.copy(); } return nurbs_to_bezier(input); + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + return {}; + } } BLI_assert_unreachable(); return {}; @@ -341,6 +345,9 @@ static SplinePtr convert_to_nurbs(const Spline &input) return bezier_to_nurbs(input); case CURVE_TYPE_POLY: return poly_to_nurbs(input); + case CURVE_TYPE_CATMULL_ROM: + BLI_assert_unreachable(); + return {}; } BLI_assert_unreachable(); return {}; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc index 6e8a505f9c4..81c3f14d8b1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc @@ -237,6 +237,10 @@ static void subdivide_builtin_attributes(const Spline &src_spline, subdivide_attribute<float>(src.weights(), offsets, is_cyclic, dst.weights()); break; } + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + break; + } } } 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 652377065b0..6f2eb9f23c4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc @@ -376,6 +376,9 @@ static void trim_spline(SplinePtr &spline, case CURVE_TYPE_NURBS: spline = std::make_unique<PolySpline>(trim_nurbs_spline(*spline, start, end)); break; + case CURVE_TYPE_CATMULL_ROM: + BLI_assert_unreachable(); + spline = {}; } spline->mark_cache_invalid(); } @@ -486,6 +489,9 @@ static void to_single_point_spline(SplinePtr &spline, const Spline::LookupResult case CURVE_TYPE_NURBS: spline = std::make_unique<PolySpline>(to_single_point_nurbs(*spline, lookup)); break; + case CURVE_TYPE_CATMULL_ROM: + BLI_assert_unreachable(); + spline = {}; } } diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc index 60aabc7ce37..c11b82a7d99 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc @@ -349,6 +349,10 @@ static void spline_copy_builtin_attributes(const Spline &spline, copy_data_based_on_mask(src.weights(), dst.weights(), mask); break; } + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + break; + } } } diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc b/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc index ca10b640653..4ee7c52a872 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc @@ -64,6 +64,10 @@ static Array<float3> curve_tangent_point_domain(const CurveEval &curve) calculate_nurbs_tangents(static_cast<const NURBSpline &>(spline), spline_tangents); break; } + case CURVE_TYPE_CATMULL_ROM: { + BLI_assert_unreachable(); + break; + } } } }); |