Merge branch 'blender-v3.3-release'
This commit is contained in:
commit
d6b970dd7b
|
@ -860,6 +860,7 @@ template<typename T> inline GVArray::GVArray(const VArray<T> &varray)
|
|||
* #this is destructed. */
|
||||
if (info.type == CommonVArrayInfo::Type::Span && !info.may_have_ownership) {
|
||||
*this = GVArray::ForSpan(GSpan(CPPType::get<T>(), info.data, varray.size()));
|
||||
return;
|
||||
}
|
||||
if (varray.try_assign_GVArray(*this)) {
|
||||
return;
|
||||
|
|
|
@ -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()};
|
||||
|
|
Loading…
Reference in New Issue