[Bf-blender-cvs] [e43c171455e] temp-attribute-processor: Cleanup

[Jacques Lucke]

Commit: e43c171455e2e97bf8df7141a4d30e0e99af9057
Author: Jacques Lucke
Date:   Wed Jun 9 10:37:02 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rBe43c171455e2e97bf8df7141a4d30e0e99af9057

Cleanup

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

M	source/blender/editors/space_node/drawnode.cc
M	source/blender/editors/space_node/node_group.cc
M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/nodes/geometry/node_attribute_tree.cc

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

diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index e8e25951999..c3ba83b01fd 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -628,7 +628,7 @@ static void node_draw_buttons_group_input(uiLayout *layout, bContext *UNUSED(C),
   PointerRNA props;
   uiItemFullO(layout,
               "node.group_interface_add",
-              "New Input",
+              "New",
               ICON_ADD,
               nullptr,
               WM_OP_INVOKE_DEFAULT,
@@ -647,7 +647,7 @@ static void node_draw_buttons_group_output(uiLayout *layout, bContext *UNUSED(C)
   PointerRNA props;
   uiItemFullO(layout,
               "node.group_interface_add",
-              "New Output",
+              "New",
               ICON_ADD,
               nullptr,
               WM_OP_INVOKE_DEFAULT,
@@ -3464,7 +3464,7 @@ void ED_node_init_butfuncs(void)
   ntreeType_Shader->ui_icon = ICON_NODE_MATERIAL;
   ntreeType_Texture->ui_icon = ICON_NODE_TEXTURE;
   ntreeType_Geometry->ui_icon = ICON_NODETREE;
-  ntreeType_Attribute->ui_icon = ICON_SPREADSHEET;
+  ntreeType_Attribute->ui_icon = ICON_NODETREE;
 }
 
 void ED_init_custom_node_type(bNodeType *ntype)
diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc
index 2af0bc0f7c4..22a890a6395 100644
--- a/source/blender/editors/space_node/node_group.cc
+++ b/source/blender/editors/space_node/node_group.cc
@@ -1141,7 +1141,7 @@ void NODE_OT_group_insert(wmOperatorType *ot)
 /** \} */
 
 /* -------------------------------------------------------------------- */
-/** \name Group Interface Adds Operator
+/** \name Group Interface Add Operator
  * \{ */
 
 static int node_group_interface_add_invoke(bContext *C,
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 0bf000d2a6d..e5fb40ee5b3 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -4551,8 +4551,7 @@ static void rna_GeometryNodeAttributeProcessor_mode_update(Main *bmain,
                                                            PointerRNA *ptr)
 {
   /* Unfortunately, `ptr->data` points to data within the node storage. We can't get the node
-   * without iterating over all nodes.
-   * TODO: Investigate the viability of adding a back-pointer to the node. */
+   * without iterating over all nodes. */
   bNodeTree *ntree = (bNodeTree *)ptr->owner_id;
   LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
     if (node->type == GEO_NODE_ATTRIBUTE_PROCESSOR) {
@@ -11702,7 +11701,7 @@ static void rna_def_nodetree(BlenderRNA *brna)
       {NTREE_TEXTURE, "TEXTURE", ICON_TEXTURE, "Texture", "Texture nodes"},
       {NTREE_COMPOSIT, "COMPOSITING", ICON_RENDERLAYERS, "Compositing", "Compositing nodes"},
       {NTREE_GEOMETRY, "GEOMETRY", ICON_NODETREE, "Geometry", "Geometry nodes"},
-      {NTREE_ATTRIBUTE, "ATTRIBUTE", ICON_SPREADSHEET, "Attribute", "Attribute Nodes"},
+      {NTREE_ATTRIBUTE, "ATTRIBUTE", ICON_NODETREE, "Attribute", "Attribute Nodes"},
       {0, NULL, 0, NULL, NULL},
   };
 
@@ -11960,7 +11959,7 @@ static void rna_def_attribute_nodetree(BlenderRNA *brna)
                          "Attribute Node Tree",
                          "Node tree consisting of linked nodes used for attribute processing");
   RNA_def_struct_sdna(srna, "bNodeTree");
-  RNA_def_struct_ui_icon(srna, ICON_SPREADSHEET);
+  RNA_def_struct_ui_icon(srna, ICON_NODETREE);
 }
 
 static StructRNA *define_specific_node(BlenderRNA *brna,
diff --git a/source/blender/nodes/geometry/node_attribute_tree.cc b/source/blender/nodes/geometry/node_attribute_tree.cc
index 58fd147b0d7..9e16b9ef75b 100644
--- a/source/blender/nodes/geometry/node_attribute_tree.cc
+++ b/source/blender/nodes/geometry/node_attribute_tree.cc
@@ -41,8 +41,7 @@ static void attribute_node_tree_update(bNodeTree *ntree)
 static bool attribute_node_tree_socket_type_valid(eNodeSocketDatatype socket_type,
                                                   bNodeTreeType *UNUSED(ntreetype))
 {
-  return ELEM(
-      socket_type, SOCK_FLOAT, SOCK_VECTOR, SOCK_RGBA, SOCK_BOOLEAN, SOCK_INT, SOCK_OBJECT);
+  return ELEM(socket_type, SOCK_FLOAT, SOCK_VECTOR, SOCK_RGBA, SOCK_BOOLEAN, SOCK_INT);
 }
 
 void register_node_tree_type_attr()