Cleanup: use movable output attribute instead of optional

This simplifies the code a bit and improves compile times a bit.

1 files changed, 11 insertions, 0 deletions

diff --git a/source/blender/blenkernel/BKE_attribute_access.hh b/source/blender/blenkernel/BKE_attribute_access.hh
index 25ee4d3c132..ef43e21b739 100644
--- a/source/blender/blenkernel/BKE_attribute_access.hh
+++ b/source/blender/blenkernel/BKE_attribute_access.hh
@@ -248,6 +248,7 @@ template<typename T> class OutputAttribute_Typed {
   VMutableArray<T> *varray_ = nullptr;
 
  public:
+  OutputAttribute_Typed() = default;
   OutputAttribute_Typed(OutputAttribute attribute) : attribute_(std::move(attribute))
   {
     if (attribute_) {
@@ -259,6 +260,16 @@ template<typename T> class OutputAttribute_Typed {
   OutputAttribute_Typed(OutputAttribute_Typed &&other) = default;
   ~OutputAttribute_Typed() = default;
 
+  OutputAttribute_Typed &operator=(OutputAttribute_Typed &&other)
+  {
+    if (this == &other) {
+      return *this;
+    }
+    this->~OutputAttribute_Typed();
+    new (this) OutputAttribute_Typed(std::move(other));
+    return *this;
+  }
+
   operator bool() const
   {
     return varray_ != nullptr;