1 files changed, 28 insertions, 12 deletions

diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
index fad93962708..5f5969de78c 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
@@ -24,6 +24,7 @@
 #include "node_shader_util.h"
 
 #include "NOD_math_functions.hh"
+#include "NOD_socket_search_link.hh"
 
 namespace blender::nodes {
 
@@ -38,6 +39,18 @@ static void sh_node_vector_math_declare(NodeDeclarationBuilder &b)
   b.add_output<decl::Float>(N_("Value"));
 };
 
+static void sh_node_vector_math_gather_link_searches(GatherLinkSearchOpParams &params)
+{
+  /* For now, do something very basic (only exposing "Add", and a single "Vector" socket). */
+  if (params.node_tree().typeinfo->validate_link(
+          static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_VECTOR)) {
+    params.add_item(IFACE_("Vector"), [](LinkSearchOpParams &params) {
+      bNode &node = params.add_node("ShaderNodeVectorMath");
+      params.update_and_connect_available_socket(node, "Vector");
+    });
+  }
+}
+
 }  // namespace blender::nodes
 
 static const char *gpu_shader_get_name(int mode)
@@ -201,8 +214,8 @@ static const blender::fn::MultiFunction *get_multi_function(bNode &node)
 
   blender::nodes::try_dispatch_float_math_fl3_fl3_to_fl3(
       operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
-        static blender::fn::CustomMF_SI_SI_SO<float3, float3, float3> fn{info.title_case_name,
-                                                                         function};
+        static blender::fn::CustomMF_SI_SI_SO<float3, float3, float3> fn{
+            info.title_case_name.c_str(), function};
         multi_fn = &fn;
       });
   if (multi_fn != nullptr) {
@@ -212,7 +225,7 @@ static const blender::fn::MultiFunction *get_multi_function(bNode &node)
   blender::nodes::try_dispatch_float_math_fl3_fl3_fl3_to_fl3(
       operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
         static blender::fn::CustomMF_SI_SI_SI_SO<float3, float3, float3, float3> fn{
-            info.title_case_name, function};
+            info.title_case_name.c_str(), function};
         multi_fn = &fn;
       });
   if (multi_fn != nullptr) {
@@ -222,7 +235,7 @@ static const blender::fn::MultiFunction *get_multi_function(bNode &node)
   blender::nodes::try_dispatch_float_math_fl3_fl3_fl_to_fl3(
       operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
         static blender::fn::CustomMF_SI_SI_SI_SO<float3, float3, float, float3> fn{
-            info.title_case_name, function};
+            info.title_case_name.c_str(), function};
         multi_fn = &fn;
       });
   if (multi_fn != nullptr) {
@@ -231,8 +244,8 @@ static const blender::fn::MultiFunction *get_multi_function(bNode &node)
 
   blender::nodes::try_dispatch_float_math_fl3_fl3_to_fl(
       operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
-        static blender::fn::CustomMF_SI_SI_SO<float3, float3, float> fn{info.title_case_name,
-                                                                        function};
+        static blender::fn::CustomMF_SI_SI_SO<float3, float3, float> fn{
+            info.title_case_name.c_str(), function};
         multi_fn = &fn;
       });
   if (multi_fn != nullptr) {
@@ -241,8 +254,8 @@ static const blender::fn::MultiFunction *get_multi_function(bNode &node)
 
   blender::nodes::try_dispatch_float_math_fl3_fl_to_fl3(
       operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
-        static blender::fn::CustomMF_SI_SI_SO<float3, float, float3> fn{info.title_case_name,
-                                                                        function};
+        static blender::fn::CustomMF_SI_SI_SO<float3, float, float3> fn{
+            info.title_case_name.c_str(), function};
         multi_fn = &fn;
       });
   if (multi_fn != nullptr) {
@@ -251,7 +264,8 @@ static const blender::fn::MultiFunction *get_multi_function(bNode &node)
 
   blender::nodes::try_dispatch_float_math_fl3_to_fl3(
       operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
-        static blender::fn::CustomMF_SI_SO<float3, float3> fn{info.title_case_name, function};
+        static blender::fn::CustomMF_SI_SO<float3, float3> fn{info.title_case_name.c_str(),
+                                                              function};
         multi_fn = &fn;
       });
   if (multi_fn != nullptr) {
@@ -260,7 +274,8 @@ static const blender::fn::MultiFunction *get_multi_function(bNode &node)
 
   blender::nodes::try_dispatch_float_math_fl3_to_fl(
       operation, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
-        static blender::fn::CustomMF_SI_SO<float3, float> fn{info.title_case_name, function};
+        static blender::fn::CustomMF_SI_SO<float3, float> fn{info.title_case_name.c_str(),
+                                                             function};
         multi_fn = &fn;
       });
   if (multi_fn != nullptr) {
@@ -277,16 +292,17 @@ static void sh_node_vector_math_build_multi_function(
   builder.set_matching_fn(fn);
 }
 
-void register_node_type_sh_vect_math(void)
+void register_node_type_sh_vect_math()
 {
   static bNodeType ntype;
 
   sh_fn_node_type_base(&ntype, SH_NODE_VECTOR_MATH, "Vector Math", NODE_CLASS_OP_VECTOR, 0);
   ntype.declare = blender::nodes::sh_node_vector_math_declare;
-  node_type_label(&ntype, node_vector_math_label);
+  ntype.labelfunc = node_vector_math_label;
   node_type_gpu(&ntype, gpu_shader_vector_math);
   node_type_update(&ntype, node_shader_update_vector_math);
   ntype.build_multi_function = sh_node_vector_math_build_multi_function;
+  ntype.gather_link_search_ops = blender::nodes::sh_node_vector_math_gather_link_searches;
 
   nodeRegisterType(&ntype);
 }