Merge branch 'master' into tmp-usd-alab-v2-T100452tmp-usd-alab-v2-T100452

1 files changed, 5 insertions, 8 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
index 54dfa00eadd..7c031b354e5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
@@ -23,6 +23,8 @@
 
 namespace blender::nodes::node_composite_ellipsemask_cc {
 
+NODE_STORAGE_FUNCS(NodeEllipseMask)
+
 static void cmp_node_ellipsemask_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Float>(N_("Mask")).default_value(0.0f).min(0.0f).max(1.0f);
@@ -121,24 +123,19 @@ class EllipseMaskOperation : public NodeOperation {
     }
   }
 
-  NodeEllipseMask &get_node_ellipse_mask()
-  {
-    return *static_cast<NodeEllipseMask *>(bnode().storage);
-  }
-
   float2 get_location()
   {
-    return float2(get_node_ellipse_mask().x, get_node_ellipse_mask().y);
+    return float2(node_storage(bnode()).x, node_storage(bnode()).y);
   }
 
   float2 get_size()
   {
-    return float2(get_node_ellipse_mask().width, get_node_ellipse_mask().height);
+    return float2(node_storage(bnode()).width, node_storage(bnode()).height);
   }
 
   float get_angle()
   {
-    return get_node_ellipse_mask().rotation;
+    return node_storage(bnode()).rotation;
   }
 };