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_lensdist.cc b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc
index 2d4c0afcda7..260fccf66d0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc
@@ -32,6 +32,8 @@
 
 namespace blender::nodes::node_composite_lensdist_cc {
 
+NODE_STORAGE_FUNCS(NodeLensDist)
+
 static void cmp_node_lensdist_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Color>(N_("Image"))
@@ -197,22 +199,17 @@ class LensDistortionOperation : public NodeOperation {
 
   bool get_is_projector()
   {
-    return get_node_lens_distortion().proj;
+    return node_storage(bnode()).proj;
   }
 
   bool get_is_jitter()
   {
-    return get_node_lens_distortion().jit;
+    return node_storage(bnode()).jit;
   }
 
   bool get_is_fit()
   {
-    return get_node_lens_distortion().fit;
-  }
-
-  NodeLensDist &get_node_lens_distortion()
-  {
-    return *static_cast<NodeLensDist *>(bnode().storage);
+    return node_storage(bnode()).fit;
   }
 
   /* Returns true if the operation does nothing and the input can be passed through. */