griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove unnecessary anonymous attribute checks

Browse Source 
These come from the time when anonymous attributes weren't
just names with a different prefix.
This commit is contained in:
Hans Goudey
2024-12-10 14:31:01 -05:00
parent 93e8c231aa
commit d3fdfe013d
3 changed files with 32 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
source/blender/blenkernel/intern/attribute_access_intern.hh
View File

@@ -261,28 +261,21 @@ class GeometryAttributeProviders {
namespace attribute_accessor_functions {
template<const GeometryAttributeProviders &providers>
inline bool is_builtin(const void * /*owner*/, const StringRef attribute_id)
inline bool is_builtin(const void * /*owner*/, const StringRef name)
{
if (bke::attribute_name_is_anonymous(attribute_id)) {
return false;
}
const StringRef name = attribute_id;
return providers.builtin_attribute_providers().contains_as(name);
}
template<const GeometryAttributeProviders &providers>
inline GAttributeReader lookup(const void *owner, const StringRef attribute_id)
inline GAttributeReader lookup(const void *owner, const StringRef name)
{
if (!bke::attribute_name_is_anonymous(attribute_id)) {
const StringRef name = attribute_id;
if (const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(name, nullptr))
{
return provider->try_get_for_read(owner);
}
if (const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(name, nullptr))
{
return provider->try_get_for_read(owner);
}
for (const DynamicAttributesProvider *provider : providers.dynamic_attribute_providers()) {
GAttributeReader attribute = provider->try_get_for_read(owner, attribute_id);
GAttributeReader attribute = provider->try_get_for_read(owner, name);
if (attribute) {
return attribute;
}
@@ -324,14 +317,10 @@ inline void foreach_attribute(const void *owner,
}
template<const GeometryAttributeProviders &providers>
inline AttributeValidator lookup_validator(const void * /*owner*/,
const blender::StringRef attribute_id)
inline AttributeValidator lookup_validator(const void * /*owner*/, const blender::StringRef name)
{
if (bke::attribute_name_is_anonymous(attribute_id)) {
return {};
}
const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(attribute_id, nullptr);
providers.builtin_attribute_providers().lookup_default_as(name, nullptr);
if (!provider) {
return {};
}
@@ -339,18 +328,15 @@ inline AttributeValidator lookup_validator(const void * /*owner*/,
}
template<const GeometryAttributeProviders &providers>
inline GAttributeWriter lookup_for_write(void *owner, const StringRef attribute_id)
inline GAttributeWriter lookup_for_write(void *owner, const StringRef name)
{
if (!bke::attribute_name_is_anonymous(attribute_id)) {
const StringRef name = attribute_id;
if (const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(name, nullptr))
{
return provider->try_get_for_write(owner);
}
if (const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(name, nullptr))
{
return provider->try_get_for_write(owner);
}
for (const DynamicAttributesProvider *provider : providers.dynamic_attribute_providers()) {
GAttributeWriter attribute = provider->try_get_for_write(owner, attribute_id);
GAttributeWriter attribute = provider->try_get_for_write(owner, name);
if (attribute) {
return attribute;
}
@@ -359,18 +345,15 @@ inline GAttributeWriter lookup_for_write(void *owner, const StringRef attribute_
}
template<const GeometryAttributeProviders &providers>
inline bool remove(void *owner, const StringRef attribute_id)
inline bool remove(void *owner, const StringRef name)
{
if (!bke::attribute_name_is_anonymous(attribute_id)) {
const StringRef name = attribute_id;
if (const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(name, nullptr))
{
return provider->try_delete(owner);
}
if (const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(name, nullptr))
{
return provider->try_delete(owner);
}
for (const DynamicAttributesProvider *provider : providers.dynamic_attribute_providers()) {
if (provider->try_delete(owner, attribute_id)) {
if (provider->try_delete(owner, name)) {
return true;
}
}
@@ -379,27 +362,24 @@ inline bool remove(void *owner, const StringRef attribute_id)
template<const GeometryAttributeProviders &providers>
inline bool add(void *owner,
const StringRef attribute_id,
const StringRef name,
AttrDomain domain,
eCustomDataType data_type,
const AttributeInit &initializer)
{
if (!bke::attribute_name_is_anonymous(attribute_id)) {
const StringRef name = attribute_id;
if (const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(name, nullptr))
{
if (provider->domain() != domain) {
return false;
}
if (provider->data_type() != data_type) {
return false;
}
return provider->try_create(owner, initializer);
if (const BuiltinAttributeProvider *provider =
providers.builtin_attribute_providers().lookup_default_as(name, nullptr))
{
if (provider->domain() != domain) {
return false;
}
if (provider->data_type() != data_type) {
return false;
}
return provider->try_create(owner, initializer);
}
for (const DynamicAttributesProvider *provider : providers.dynamic_attribute_providers()) {
if (provider->try_create(owner, attribute_id, domain, data_type, initializer)) {
if (provider->try_create(owner, name, domain, data_type, initializer)) {
return true;
}
}

9
source/blender/blenkernel/intern/curves_attributes.cc
View File

@@ -49,9 +49,6 @@ class CurvesVertexGroupsAttributeProvider final : public DynamicAttributesProvid
public:
GAttributeReader try_get_for_read(const void *owner, const StringRef attribute_id) const final
{
if (bke::attribute_name_is_anonymous(attribute_id)) {
return {};
}
const CurvesGeometry *curves = static_cast<const CurvesGeometry *>(owner);
if (curves == nullptr) {
return {};
@@ -78,9 +75,6 @@ class CurvesVertexGroupsAttributeProvider final : public DynamicAttributesProvid
GAttributeWriter try_get_for_write(void *owner, const StringRef attribute_id) const final
{
if (bke::attribute_name_is_anonymous(attribute_id)) {
return {};
}
CurvesGeometry *curves = static_cast<CurvesGeometry *>(owner);
if (curves == nullptr) {
return {};
@@ -96,9 +90,6 @@ class CurvesVertexGroupsAttributeProvider final : public DynamicAttributesProvid
bool try_delete(void *owner, const StringRef attribute_id) const final
{
if (bke::attribute_name_is_anonymous(attribute_id)) {
return false;
}
CurvesGeometry *curves = static_cast<CurvesGeometry *>(owner);
if (curves == nullptr) {
return true;

9
source/blender/blenkernel/intern/mesh_attributes.cc
View File

@@ -727,9 +727,6 @@ class MeshVertexGroupsAttributeProvider final : public DynamicAttributesProvider
public:
GAttributeReader try_get_for_read(const void *owner, const StringRef attribute_id) const final
{
if (bke::attribute_name_is_anonymous(attribute_id)) {
return {};
}
const Mesh *mesh = static_cast<const Mesh *>(owner);
if (mesh == nullptr) {
return {};
@@ -756,9 +753,6 @@ class MeshVertexGroupsAttributeProvider final : public DynamicAttributesProvider
GAttributeWriter try_get_for_write(void *owner, const StringRef attribute_id) const final
{
if (bke::attribute_name_is_anonymous(attribute_id)) {
return {};
}
Mesh *mesh = static_cast<Mesh *>(owner);
if (mesh == nullptr) {
return {};
@@ -775,9 +769,6 @@ class MeshVertexGroupsAttributeProvider final : public DynamicAttributesProvider
bool try_delete(void *owner, const StringRef attribute_id) const final
{
if (bke::attribute_name_is_anonymous(attribute_id)) {
return false;
}
Mesh *mesh = static_cast<Mesh *>(owner);
if (mesh == nullptr) {
return true;