[Bf-blender-cvs] [0aa73156083] master: Fix (unreported): remove menu separators from drag link search

[Charlie Jolly]

Commit: 0aa73156083821d45c7794ea964d7fd5e6d13b25
Author: Charlie Jolly
Date:   Fri Dec 31 01:15:00 2021 +0000
Branches: master
https://developer.blender.org/rB0aa73156083821d45c7794ea964d7fd5e6d13b25

Fix (unreported): remove menu separators from drag link search

Search was picking up the menu separator entries.
Add check for these which are defined by empty identifier strings.

===================================================================

M	source/blender/nodes/shader/nodes/node_shader_math.cc
M	source/blender/nodes/shader/nodes/node_shader_vector_math.cc

===================================================================

diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc
index 677e62d14b2..7337a1172bf 100644
--- a/source/blender/nodes/shader/nodes/node_shader_math.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_math.cc
@@ -72,7 +72,7 @@ static void sh_node_math_gather_link_searches(GatherLinkSearchOpParams &params)
           static_cast<eNodeSocketDatatype>(params.other_socket().type), SOCK_FLOAT)) {
     for (const EnumPropertyItem *item = rna_enum_node_math_items; item->identifier != nullptr;
          item++) {
-      if (item->name != nullptr) {
+      if (item->name != nullptr && item->identifier != "") {
         params.add_item(IFACE_(item->name),
                         SocketSearchOp{"Value", (NodeMathOperation)item->value});
       }
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 312929abd0d..0218e759bea 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc
@@ -66,7 +66,7 @@ static void sh_node_vector_math_gather_link_searches(GatherLinkSearchOpParams &p
 
   for (const EnumPropertyItem *item = rna_enum_node_vec_math_items; item->identifier != nullptr;
        item++) {
-    if (item->name != nullptr) {
+    if (item->name != nullptr && item->identifier != "") {
       if ((params.in_out() == SOCK_OUT) && ELEM(item->value,
                                                 NODE_VECTOR_MATH_LENGTH,
                                                 NODE_VECTOR_MATH_DISTANCE,