1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/functions/intern/attributes_ref.cc b/source/blender/functions/intern/attributes_ref.cc
index 7bfcc69671a..4686e217911 100644
--- a/source/blender/functions/intern/attributes_ref.cc
+++ b/source/blender/functions/intern/attributes_ref.cc
@@ -25,7 +25,7 @@ AttributesInfoBuilder::~AttributesInfoBuilder()
   }
 }
 
-void AttributesInfoBuilder::add(StringRef name, const CPPType &type, const void *default_value)
+bool AttributesInfoBuilder::add(StringRef name, const CPPType &type, const void *default_value)
 {
   if (names_.add_as(name)) {
     types_.append(&type);
@@ -36,10 +36,15 @@ void AttributesInfoBuilder::add(StringRef name, const CPPType &type, const void
     void *dst = allocator_.allocate(type.size(), type.alignment());
     type.copy_to_uninitialized(default_value, dst);
     defaults_.append(dst);
+    return true;
   }
   else {
-    /* The same name can be added more than once as long as the type is always the same. */
-    BLI_assert(types_[names_.index_of_as(name)] == &type);
+    const CPPType &stored_type = *types_[names_.index_of_as(name)];
+    if (stored_type != type) {
+      std::cout << "Warning: Tried to add an attribute twice with different types (" << name
+                << ": " << stored_type.name() << ", " << type.name() << ").\n";
+    }
+    return false;
   }
 }