archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix: Errors in previous cleanup commit

Browse Source 
f3ef0763b4 introduced a file by mistake, and didn't add
a new enum type to many switch cases. Sorry for the noise.
This commit is contained in:
Hans Goudey
2022-02-22 22:15:03 -05:00
parent f3ef0763b4
commit 06bc20f61a
11 changed files with 48 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_spline_type.cc
View File

@@ -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 {};

4
source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_curve_subdivide.cc
View File

@@ -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;
}
}
}

4
source/blender/nodes/geometry/nodes/legacy/node_geo_legacy_delete_geometry.cc
View File

@@ -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;
}
}
}

4
source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
View File

@@ -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;

4
source/blender/nodes/geometry/nodes/node_geo_curve_spline_parameter.cc
View File

@@ -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;
}
}
}
});

7
source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc
View File

@@ -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 {};

4
source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc
View File

@@ -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;
}
}
}

6
source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
View File

@@ -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 = {};
}
}

4
source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
View File

@@ -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;
}
}
}

4
source/blender/nodes/geometry/nodes/node_geo_input_tangent.cc
View File

@@ -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;
}
}
}
});