Geometry Nodes: use texture socket in Attribute Sample Texture node

There is a new Texture data-block socket that we can use in Geometry
Nodes now. This commit replaces the texture property of a node and
gives it a texture input socket instead. That increases flexibility.

The texture socket still has some limitations that will be lifted in the
next couple of days (e.g. it's not supported by the switch node and
cannot be exposed the a modifier yet).

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

2 files changed, 30 insertions, 22 deletions

diff --git a/source/blender/editors/space_buttons/buttons_intern.h b/source/blender/editors/space_buttons/buttons_intern.h
index 74e7bc11c26..7564fa4b930 100644
--- a/source/blender/editors/space_buttons/buttons_intern.h
+++ b/source/blender/editors/space_buttons/buttons_intern.h
@@ -35,6 +35,7 @@ struct bContext;
 struct bContextDataResult;
 struct bNode;
 struct bNodeTree;
+struct bNodeSocket;
 struct wmOperatorType;
 
 struct SpaceProperties_Runtime {
@@ -66,6 +67,7 @@ typedef struct ButsTextureUser {
 
   struct bNodeTree *ntree;
   struct bNode *node;
+  struct bNodeSocket *socket;
 
   const char *category;
   int icon;
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c
index 43128ed00fa..97e3cb750c1 100644
--- a/source/blender/editors/space_buttons/buttons_texture.c
+++ b/source/blender/editors/space_buttons/buttons_texture.c
@@ -75,15 +75,16 @@ static SpaceProperties *find_space_properties(const bContext *C);
 
 /************************* Texture User **************************/
 
-static void buttons_texture_user_node_property_add(ListBase *users,
-                                                   ID *id,
-                                                   PointerRNA ptr,
-                                                   PropertyRNA *prop,
-                                                   bNodeTree *ntree,
-                                                   bNode *node,
-                                                   const char *category,
-                                                   int icon,
-                                                   const char *name)
+static void buttons_texture_user_socket_property_add(ListBase *users,
+                                                     ID *id,
+                                                     PointerRNA ptr,
+                                                     PropertyRNA *prop,
+                                                     bNodeTree *ntree,
+                                                     bNode *node,
+                                                     bNodeSocket *socket,
+                                                     const char *category,
+                                                     int icon,
+                                                     const char *name)
 {
   ButsTextureUser *user = MEM_callocN(sizeof(ButsTextureUser), "ButsTextureUser");
 
@@ -92,6 +93,7 @@ static void buttons_texture_user_node_property_add(ListBase *users,
   user->prop = prop;
   user->ntree = ntree;
   user->node = node;
+  user->socket = socket;
   user->category = category;
   user->icon = icon;
   user->name = name;
@@ -181,25 +183,29 @@ static void buttons_texture_modifier_geonodes_users_add(Object *ob,
       /* Recurse into the node group */
       buttons_texture_modifier_geonodes_users_add(ob, nmd, (bNodeTree *)node->id, users);
     }
-    else if (node->type == GEO_NODE_ATTRIBUTE_SAMPLE_TEXTURE) {
-      RNA_pointer_create(&node_tree->id, &RNA_Node, node, &ptr);
-      prop = RNA_struct_find_property(&ptr, "texture");
-      if (prop == NULL) {
+    LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
+      if (socket->flag & SOCK_UNAVAIL) {
+        continue;
+      }
+      if (socket->type != SOCK_TEXTURE) {
         continue;
       }
+      RNA_pointer_create(&node_tree->id, &RNA_NodeSocket, socket, &ptr);
+      prop = RNA_struct_find_property(&ptr, "default_value");
 
       PointerRNA texptr = RNA_property_pointer_get(&ptr, prop);
       Tex *tex = (RNA_struct_is_a(texptr.type, &RNA_Texture)) ? (Tex *)texptr.data : NULL;
       if (tex != NULL) {
-        buttons_texture_user_node_property_add(users,
-                                               &ob->id,
-                                               ptr,
-                                               prop,
-                                               node_tree,
-                                               node,
-                                               N_("Geometry Nodes"),
-                                               RNA_struct_ui_icon(ptr.type),
-                                               nmd->modifier.name);
+        buttons_texture_user_socket_property_add(users,
+                                                 &ob->id,
+                                                 ptr,
+                                                 prop,
+                                                 node_tree,
+                                                 node,
+                                                 socket,
+                                                 N_("Geometry Nodes"),
+                                                 RNA_struct_ui_icon(ptr.type),
+                                                 nmd->modifier.name);
       }
     }
   }