Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view

1 files changed, 3 insertions, 5 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 6a786571f43..16f79f4e730 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
@@ -32,7 +32,7 @@ static void cmp_node_distance_matte_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>(N_("Matte"));
 }
 
-static void node_composit_init_distance_matte(bNodeTree *UNUSED(ntree), bNode *node)
+static void node_composit_init_distance_matte(bNodeTree * /*ntree*/, bNode *node)
 {
   NodeChroma *c = MEM_cnew<NodeChroma>(__func__);
   node->storage = c;
@@ -41,9 +41,7 @@ static void node_composit_init_distance_matte(bNodeTree *UNUSED(ntree), bNode *n
   c->t2 = 0.1f;
 }
 
-static void node_composit_buts_distance_matte(uiLayout *layout,
-                                              bContext *UNUSED(C),
-                                              PointerRNA *ptr)
+static void node_composit_buts_distance_matte(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr)
 {
   uiLayout *col, *row;
 
@@ -125,7 +123,7 @@ void register_node_type_cmp_distance_matte()
   ntype.declare = file_ns::cmp_node_distance_matte_declare;
   ntype.draw_buttons = file_ns::node_composit_buts_distance_matte;
   ntype.flag |= NODE_PREVIEW;
-  node_type_init(&ntype, file_ns::node_composit_init_distance_matte);
+  ntype.initfunc = file_ns::node_composit_init_distance_matte;
   node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
   ntype.get_compositor_shader_node = file_ns::get_compositor_shader_node;