[Bf-blender-cvs] [fd7333f951f] temp-geometry-nodes-attribute-search: Cleanup: Rename function, remove TODO comment
Hans Goudey
noreply at git.blender.org
Wed Feb 24 00:27:46 CET 2021
Commit: fd7333f951f6905095729efcefde2ccf2e91e582
Author: Hans Goudey
Date: Tue Feb 23 17:21:44 2021 -0600
Branches: temp-geometry-nodes-attribute-search
https://developer.blender.org/rBfd7333f951f6905095729efcefde2ccf2e91e582
Cleanup: Rename function, remove TODO comment
===================================================================
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_geometry_attribute_search.cc
M source/blender/editors/space_node/node_intern.h
===================================================================
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index ddc6adbb52f..580aea8af11 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -3406,7 +3406,7 @@ static void std_node_socket_draw(
0.0f,
0.0f,
"");
- button_add_attribute_search(C, node, sock, block, but);
+ node_socket_button_add_attribute_search(C, node, sock, block, but);
break;
}
case SOCK_OBJECT: {
diff --git a/source/blender/editors/space_node/node_geometry_attribute_search.cc b/source/blender/editors/space_node/node_geometry_attribute_search.cc
index cf03533767d..d690aab137b 100644
--- a/source/blender/editors/space_node/node_geometry_attribute_search.cc
+++ b/source/blender/editors/space_node/node_geometry_attribute_search.cc
@@ -94,12 +94,11 @@ static void attribute_search_free_fn(void *arg)
delete data;
}
-void button_add_attribute_search(
+void node_socket_button_add_attribute_search(
const bContext *C, bNode *node, bNodeSocket *socket, uiBlock *block, uiBut *but)
{
BLI_assert(socket->type == SOCK_STRING);
- /* TODO: This could just get a node tree argument. */
SpaceNode *space_node = CTX_wm_space_node(C);
if (space_node == nullptr) {
return;
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index ce070963c06..697391dae4d 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -329,11 +329,11 @@ enum eNodeSpace_ButEvents {
B_NODE_SETIMAGE,
};
-void button_add_attribute_search(const struct bContext *C,
- struct bNode *node,
- struct bNodeSocket *socket,
- struct uiBlock *block,
- struct uiBut *but);
+void node_socket_button_add_attribute_search(const struct bContext *C,
+ struct bNode *node,
+ struct bNodeSocket *socket,
+ struct uiBlock *block,
+ struct uiBut *but);
#ifdef __cplusplus
}
More information about the Bf-blender-cvs
mailing list