diff options
Diffstat (limited to 'source/blender/geometry')
| -rw-r--r-- | source/blender/geometry/intern/mesh_to_curve_convert.cc | 4 | ||||
| -rw-r--r-- | source/blender/geometry/intern/realize_instances.cc | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/geometry/intern/mesh_to_curve_convert.cc b/source/blender/geometry/intern/mesh_to_curve_convert.cc index dad2612cabd..5ba9bc066fd 100644 --- a/source/blender/geometry/intern/mesh_to_curve_convert.cc +++ b/source/blender/geometry/intern/mesh_to_curve_convert.cc @@ -59,8 +59,8 @@ static Curves *create_curve_from_vert_indices(const MeshComponent &mesh_componen continue; } - const fn::GVArray mesh_attribute = mesh_component.attribute_try_get_for_read( - attribute_id, ATTR_DOMAIN_POINT); + const GVArray mesh_attribute = mesh_component.attribute_try_get_for_read(attribute_id, + ATTR_DOMAIN_POINT); /* Some attributes might not exist if they were builtin attribute on domains that don't * have any elements, i.e. a face attribute on the output of the line primitive node. */ if (!mesh_attribute) { diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc index 96291be7a96..502f5f0232e 100644 --- a/source/blender/geometry/intern/realize_instances.cc +++ b/source/blender/geometry/intern/realize_instances.cc @@ -29,11 +29,6 @@ using blender::bke::object_get_evaluated_geometry_set; using blender::bke::OutputAttribute; using blender::bke::OutputAttribute_Typed; using blender::bke::ReadAttributeLookup; -using blender::fn::GArray; -using blender::fn::GMutableSpan; -using blender::fn::GSpan; -using blender::fn::GVArray; -using blender::fn::GVArray_GSpan; /** * An ordered set of attribute ids. Attributes are ordered to avoid name lookups in many places. @@ -272,7 +267,7 @@ static void threaded_copy(const GSpan src, GMutableSpan dst) }); } -static void threaded_fill(const fn::GPointer value, GMutableSpan dst) +static void threaded_fill(const GPointer value, GMutableSpan dst) { BLI_assert(*value.type() == dst.type()); threading::parallel_for(IndexRange(dst.size()), 1024, [&](const IndexRange range) { |