[Bf-blender-cvs] [ec8a9a0d658] master: Cleanup: Remove unnecessary constructor argument
Hans Goudey
noreply at git.blender.org
Mon Oct 18 19:35:33 CEST 2021
Commit: ec8a9a0d6586d01b144ce4168e0f57d29ef7f738
Author: Hans Goudey
Date: Mon Oct 18 12:35:27 2021 -0500
Branches: master
https://developer.blender.org/rBec8a9a0d6586d01b144ce4168e0f57d29ef7f738
Cleanup: Remove unnecessary constructor argument
All attributes should be writeable, it is now only needed for the
legacy `normal` attribute on meshes.
===================================================================
M source/blender/blenkernel/intern/geometry_component_curve.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/geometry_component_curve.cc b/source/blender/blenkernel/intern/geometry_component_curve.cc
index 8923521d699..50c0f06b12c 100644
--- a/source/blender/blenkernel/intern/geometry_component_curve.cc
+++ b/source/blender/blenkernel/intern/geometry_component_curve.cc
@@ -980,16 +980,15 @@ template<typename T> class BuiltinPointAttributeProvider : public BuiltinAttribu
public:
BuiltinPointAttributeProvider(std::string attribute_name,
- const WritableEnum writable,
const GetSpan get_span,
const GetMutableSpan get_mutable_span,
const UpdateOnWrite update_on_write)
: BuiltinAttributeProvider(std::move(attribute_name),
ATTR_DOMAIN_POINT,
bke::cpp_type_to_custom_data_type(CPPType::get<T>()),
- BuiltinAttributeProvider::NonCreatable,
- writable,
- BuiltinAttributeProvider::NonDeletable),
+ CreatableEnum::NonCreatable,
+ WritableEnum::Writable,
+ DeletableEnum::NonDeletable),
get_span_(get_span),
get_mutable_span_(get_mutable_span),
update_on_write_(update_on_write)
@@ -1091,7 +1090,6 @@ class PositionAttributeProvider final : public BuiltinPointAttributeProvider<flo
PositionAttributeProvider()
: BuiltinPointAttributeProvider(
"position",
- BuiltinAttributeProvider::Writable,
[](const Spline &spline) { return spline.positions(); },
[](Spline &spline) { return spline.positions(); },
[](Spline &spline) { spline.mark_cache_invalid(); })
@@ -1491,14 +1489,12 @@ static ComponentAttributeProviders create_attribute_providers_for_curve()
static BuiltinPointAttributeProvider<float> radius(
"radius",
- BuiltinAttributeProvider::Writable,
[](const Spline &spline) { return spline.radii(); },
[](Spline &spline) { return spline.radii(); },
nullptr);
static BuiltinPointAttributeProvider<float> tilt(
"tilt",
- BuiltinAttributeProvider::Writable,
[](const Spline &spline) { return spline.tilts(); },
[](Spline &spline) { return spline.tilts(); },
[](Spline &spline) { spline.mark_cache_invalid(); });
More information about the Bf-blender-cvs
mailing list