Fix various cases of incorrect filtering in node link drag search

Some nodes didn't check the type of the link's socket for filtering.
Do this with a combination of manually calling the node tree's validate
links function and using the helper function for declarations.

Also clean up a few cases that added geometry sockets manually
when they can use the simpler helper function.

1 files changed, 28 insertions, 25 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
index 389dc278197..41ad4d79f1e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc
@@ -109,31 +109,34 @@ static void node_gather_link_searches(GatherLinkSearchOpParams &params)
     search_link_ops_for_declarations(params, declaration.outputs());
     return;
   }
-  params.add_item(IFACE_("Count"), [](LinkSearchOpParams &params) {
-    bNode &node = params.add_node("GeometryNodeMeshLine");
-    node_storage(node).mode = GEO_NODE_MESH_LINE_MODE_OFFSET;
-    params.connect_available_socket(node, "Count");
-  });
-  params.add_item(IFACE_("Resolution"), [](LinkSearchOpParams &params) {
-    bNode &node = params.add_node("GeometryNodeMeshLine");
-    node_storage(node).mode = GEO_NODE_MESH_LINE_MODE_OFFSET;
-    node_storage(node).count_mode = GEO_NODE_MESH_LINE_COUNT_RESOLUTION;
-    params.connect_available_socket(node, "Resolution");
-  });
-  params.add_item(IFACE_("Start Location"), [](LinkSearchOpParams &params) {
-    bNode &node = params.add_node("GeometryNodeMeshLine");
-    params.connect_available_socket(node, "Start Location");
-  });
-  params.add_item(IFACE_("Offset"), [](LinkSearchOpParams &params) {
-    bNode &node = params.add_node("GeometryNodeMeshLine");
-    params.connect_available_socket(node, "Offset");
-  });
-  /* The last socket is reused in end points mode. */
-  params.add_item(IFACE_("End Location"), [](LinkSearchOpParams &params) {
-    bNode &node = params.add_node("GeometryNodeMeshLine");
-    node_storage(node).mode = GEO_NODE_MESH_LINE_MODE_END_POINTS;
-    params.connect_available_socket(node, "Offset");
-  });
+  else if (params.node_tree().typeinfo->validate_link(
+          static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_FLOAT)) {
+    params.add_item(IFACE_("Count"), [](LinkSearchOpParams &params) {
+      bNode &node = params.add_node("GeometryNodeMeshLine");
+      node_storage(node).mode = GEO_NODE_MESH_LINE_MODE_OFFSET;
+      params.connect_available_socket(node, "Count");
+    });
+    params.add_item(IFACE_("Resolution"), [](LinkSearchOpParams &params) {
+      bNode &node = params.add_node("GeometryNodeMeshLine");
+      node_storage(node).mode = GEO_NODE_MESH_LINE_MODE_OFFSET;
+      node_storage(node).count_mode = GEO_NODE_MESH_LINE_COUNT_RESOLUTION;
+      params.connect_available_socket(node, "Resolution");
+    });
+    params.add_item(IFACE_("Start Location"), [](LinkSearchOpParams &params) {
+      bNode &node = params.add_node("GeometryNodeMeshLine");
+      params.connect_available_socket(node, "Start Location");
+    });
+    params.add_item(IFACE_("Offset"), [](LinkSearchOpParams &params) {
+      bNode &node = params.add_node("GeometryNodeMeshLine");
+      params.connect_available_socket(node, "Offset");
+    });
+    /* The last socket is reused in end points mode. */
+    params.add_item(IFACE_("End Location"), [](LinkSearchOpParams &params) {
+      bNode &node = params.add_node("GeometryNodeMeshLine");
+      node_storage(node).mode = GEO_NODE_MESH_LINE_MODE_END_POINTS;
+      params.connect_available_socket(node, "Offset");
+    });
+  }
 }
 
 static void node_geo_exec(GeoNodeExecParams params)