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_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
index 9d910b3f409..6a786571f43 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
@@ -18,6 +18,8 @@
 
 namespace blender::nodes::node_composite_distance_matte_cc {
 
+NODE_STORAGE_FUNCS(NodeChroma)
+
 static void cmp_node_distance_matte_declare(NodeDeclarationBuilder &b)
 {
   b.add_input<decl::Color>(N_("Image"))
@@ -90,24 +92,19 @@ class DistanceMatteShaderNode : public ShaderNode {
                    GPU_uniform(&falloff));
   }
 
-  NodeChroma *get_node_chroma()
-  {
-    return static_cast<NodeChroma *>(bnode().storage);
-  }
-
   CMPNodeDistanceMatteColorSpace get_color_space()
   {
-    return (CMPNodeDistanceMatteColorSpace)get_node_chroma()->channel;
+    return (CMPNodeDistanceMatteColorSpace)node_storage(bnode()).channel;
   }
 
   float get_tolerance()
   {
-    return get_node_chroma()->t1;
+    return node_storage(bnode()).t1;
   }
 
   float get_falloff()
   {
-    return get_node_chroma()->t2;
+    return node_storage(bnode()).t2;
   }
 };