diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/versioning_290.c | 1 | ||||
-rw-r--r-- | source/blender/editors/io/io_obj.c | 7 | ||||
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index 079d69be4d9..2f6f0d5c9fa 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -1711,7 +1711,6 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } - } if (!MAIN_VERSION_ATLEAST(bmain, 293, 10)) { diff --git a/source/blender/editors/io/io_obj.c b/source/blender/editors/io/io_obj.c index f253f63946b..8e380e3f2bc 100644 --- a/source/blender/editors/io/io_obj.c +++ b/source/blender/editors/io/io_obj.c @@ -293,11 +293,8 @@ void WM_OT_obj_export(struct wmOperatorType *ot) 0.01, 1000.0f); /* File Writer options. */ - RNA_def_boolean(ot->srna, - "apply_modifiers", - true, - "Apply Modifiers", - "Apply modifiers to exported meshes"); + RNA_def_boolean( + ot->srna, "apply_modifiers", true, "Apply Modifiers", "Apply modifiers to exported meshes"); RNA_def_enum(ot->srna, "export_eval_mode", io_obj_export_evaluation_mode, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc index 5955fe1f3b1..894580f2932 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc @@ -12,7 +12,6 @@ #include "node_geometry_util.hh" - namespace blender::nodes::node_geo_curve_to_points_cc { NODE_STORAGE_FUNCS(NodeGeometryCurveToPoints) @@ -64,8 +63,8 @@ static void node_update(bNodeTree *ntree, bNode *node) } static void curve_create_default_rotation_attribute(Span<float3> tangents, - Span<float3> normals, - MutableSpan<float3> rotations) + Span<float3> normals, + MutableSpan<float3> rotations) { threading::parallel_for(IndexRange(rotations.size()), 512, [&](IndexRange range) { for (const int i : range) { @@ -75,7 +74,6 @@ static void curve_create_default_rotation_attribute(Span<float3> tangents, }); } - static Array<int> calculate_spline_point_offsets(GeoNodeExecParams ¶ms, const GeometryNodeCurveResampleMode mode, const CurveEval &curve, |