Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support

1 files changed, 19 insertions, 14 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.cc b/source/blender/nodes/composite/nodes/node_composite_displace.cc
index b1ed7f05794..0137c1f7da8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_displace.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_displace.cc
@@ -25,24 +25,29 @@
 
 /* **************** Displace  ******************** */
 
-static bNodeSocketTemplate cmp_node_displace_in[] = {
-    {SOCK_RGBA, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-    {SOCK_VECTOR, N_("Vector"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_TRANSLATION},
-    {SOCK_FLOAT, N_("X Scale"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_NONE},
-    {SOCK_FLOAT, N_("Y Scale"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_NONE},
-    {-1, ""},
-};
-static bNodeSocketTemplate cmp_node_displace_out[] = {
-    {SOCK_RGBA, N_("Image")},
-    {-1, ""},
-};
-
-void register_node_type_cmp_displace(void)
+namespace blender::nodes {
+
+static void cmp_node_displace_declare(NodeDeclarationBuilder &b)
+{
+  b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
+  b.add_input<decl::Vector>(N_("Vector"))
+      .default_value({1.0f, 1.0f, 1.0f})
+      .min(0.0f)
+      .max(1.0f)
+      .subtype(PROP_TRANSLATION);
+  b.add_input<decl::Float>(N_("X Scale")).default_value(0.0f).min(-1000.0f).max(1000.0f);
+  b.add_input<decl::Float>(N_("Y Scale")).default_value(0.0f).min(-1000.0f).max(1000.0f);
+  b.add_output<decl::Color>(N_("Image"));
+}
+
+}  // namespace blender::nodes
+
+void register_node_type_cmp_displace()
 {
   static bNodeType ntype;
 
   cmp_node_type_base(&ntype, CMP_NODE_DISPLACE, "Displace", NODE_CLASS_DISTORT, 0);
-  node_type_socket_templates(&ntype, cmp_node_displace_in, cmp_node_displace_out);
+  ntype.declare = blender::nodes::cmp_node_displace_declare;
 
   nodeRegisterType(&ntype);
 }