[Bf-blender-cvs] [7be8055a070] ui-asset-view-template: Merge branch 'master' into ui-asset-view-template

[Julian Eisel]

Commit: 7be8055a070eebc89d4995fabb63a2c874ea5023
Author: Julian Eisel
Date:   Tue Mar 9 14:59:37 2021 +0100
Branches: ui-asset-view-template
https://developer.blender.org/rB7be8055a070eebc89d4995fabb63a2c874ea5023

Merge branch 'master' into ui-asset-view-template

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



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

diff --cc source/blender/editors/space_node/drawnode.c
index 977c2053187,a9a7ef5a0a2..f1c827d6d69
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@@ -3385,7 -3385,12 +3385,20 @@@ static void std_node_socket_draw
          }
        }
        break;
-     case SOCK_RGBA:
+     case SOCK_RGBA: {
+       uiLayout *row = uiLayoutSplit(layout, 0.5f, false);
+       uiItemL(row, text, 0);
 -      uiItemR(row, ptr, "default_value", DEFAULT_FLAGS, "", 0);
++
++      const bNodeTree *node_tree = (const bNodeTree *)node_ptr->owner_id;
++      if (node_tree->type == NTREE_GEOMETRY) {
++        node_geometry_add_attribute_search_button(node_tree, node, ptr, row);
++      }
++      else {
++        uiItemR(row, ptr, "default_value", DEFAULT_FLAGS, "", 0);
++      }
++
+       break;
+     }
      case SOCK_STRING: {
        uiLayout *row = uiLayoutSplit(layout, 0.5f, false);
        uiItemL(row, text, 0);