From 84272ce19a5777ef89fb3e50b5a7afb30658658b Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 27 Jul 2022 17:54:49 +0200 Subject: [PATCH 1/2] Fix: add missing return It was correct but less efficient without this early return. --- source/blender/blenlib/BLI_generic_virtual_array.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/source/blender/blenlib/BLI_generic_virtual_array.hh b/source/blender/blenlib/BLI_generic_virtual_array.hh index 43ca16a894f..21549896f45 100644 --- a/source/blender/blenlib/BLI_generic_virtual_array.hh +++ b/source/blender/blenlib/BLI_generic_virtual_array.hh @@ -860,6 +860,7 @@ template inline GVArray::GVArray(const VArray &varray) * #this is destructed. */ if (info.type == CommonVArrayInfo::Type::Span && !info.may_have_ownership) { *this = GVArray::ForSpan(GSpan(CPPType::get(), info.data, varray.size())); + return; } if (varray.try_assign_GVArray(*this)) { return; From 84a3ff63d0135a561233448187663070987e1bac Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 27 Jul 2022 18:05:31 +0200 Subject: [PATCH 2/2] Fix: missing evaluated offsets in Resample Curve node Differential Revision: https://developer.blender.org/D15556 --- source/blender/geometry/intern/resample_curves.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/source/blender/geometry/intern/resample_curves.cc b/source/blender/geometry/intern/resample_curves.cc index 86c1980d9ee..d61941aa071 100644 --- a/source/blender/geometry/intern/resample_curves.cc +++ b/source/blender/geometry/intern/resample_curves.cc @@ -345,6 +345,7 @@ Curves *resample_to_evaluated(const CurveComponent &src_component, { const bke::CurvesGeometry &src_curves = bke::CurvesGeometry::wrap( src_component.get_for_read()->geometry); + src_curves.ensure_evaluated_offsets(); bke::GeometryComponentFieldContext field_context{src_component, ATTR_DOMAIN_CURVE}; fn::FieldEvaluator evaluator{field_context, src_curves.curves_num()};