[Bf-blender-cvs] [53b82efed66] master: Fix (unreported) geometry node attribute search not working in the Properties Editor

[Philipp Oeser]

Commit: 53b82efed66baddff3b7ef6c93a919ef10f4ef42
Author: Philipp Oeser
Date:   Tue Mar 9 19:09:53 2021 +0100
Branches: master
https://developer.blender.org/rB53b82efed66baddff3b7ef6c93a919ef10f4ef42

Fix (unreported) geometry node attribute search not working in the
Properties Editor

Since rBb279fef85d1a, the nodes properties for geometry nodes using a
texture are displayed in the Properties Editor.

rB85421c4fab02 added an attribute search button, but this was missing
still (gave just the regular text button) if this was displayed in the
Properties Editor.

ref b279fef85d1a / T86416 / D10671 / D10673

Maniphest Tasks: T86416

Differential Revision: https://developer.blender.org/D10674

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

M	source/blender/editors/space_node/node_templates.c

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

diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index f0e3f5442cc..b0c0f660717 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -826,11 +826,22 @@ static void ui_node_draw_input(
         case SOCK_INT:
         case SOCK_BOOLEAN:
         case SOCK_RGBA:
-        case SOCK_STRING:
           uiItemR(sub, &inputptr, "default_value", 0, "", ICON_NONE);
           uiItemDecoratorR(
               split_wrapper.decorate_column, &inputptr, "default_value", RNA_NO_INDEX);
           break;
+        case SOCK_STRING: {
+          const bNodeTree *node_tree = (const bNodeTree *)nodeptr.owner_id;
+          if (node_tree->type == NTREE_GEOMETRY) {
+            node_geometry_add_attribute_search_button(node_tree, node, &inputptr, row);
+          }
+          else {
+            uiItemR(sub, &inputptr, "default_value", 0, "", ICON_NONE);
+          }
+          uiItemDecoratorR(
+              split_wrapper.decorate_column, &inputptr, "default_value", RNA_NO_INDEX);
+          break;
+        }
         default:
           add_dummy_decorator = true;
       }