blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Nodes: Panel declarations for grouping sockets #108649

Merged
Lukas Tönne merged 27 commits from LukasTonne/blender:node-socket-categories into main 2023-06-14 18:02:46 +02:00
Conversation 18 Commits 27 Files Changed 13 +3 -6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7aa257d2d - Show all commits

2
scripts/startup/bl_operators/node.py
View File

@ -269,7 +269,7 @@ class NODE_OT_socket_category_add(NodeSocketCategoryOperator, Operator):
tree = snode.edit_tree
categories = tree.socket_categories
# Remember index to move the item
# Remember index to move the item.
LukasTonne marked this conversation as resolved Outdated
Hans Goudey commented 2023-06-06 14:33:25 +02:00
Outdated
Review
Copy Link

Period at the end of the comment.

Period at the end of the comment.
dst_index = min(categories.active_index + 1, len(categories))
categories.new("Category")
categories.move(len(categories) - 1, dst_index)

7
source/blender/blenkernel/BKE_node.h
View File

@ -542,10 +542,7 @@ void ntreeBlendWrite(struct BlendWriter *writer, struct bNodeTree *ntree);
/** \name Node Tree Interface
* \{ */
/**
* Run this after relevant changes to categories
* to ensure sockets remain sorted by category.
*/
/** Run this after relevant changes to categories to ensure sockets remain sorted by category. */
void ntreeEnsureSocketCategoryOrder(bNodeTree *ntree);
LukasTonne marked this conversation as resolved Outdated
Hans Goudey commented 2023-06-06 14:14:43 +02:00
Outdated
Review
Copy Link

This comment fits on one line

This comment fits on one line
Lukas Tönne commented 2023-06-08 17:51:53 +02:00
Review
Copy Link

This is currently in the public API because the NODE_OT_tree_socket_move operator works directly on DNA and needs to call this after it moves sockets. That operator should also use an API method so the update function does not need to be exposed. I suggest a separate fix.

This is currently in the public API because the `NODE_OT_tree_socket_move` operator works directly on DNA and needs to call this after it moves sockets. That operator should also use an API method so the update function does not need to be exposed. I suggest a separate fix.
void ntreeRemoveSocketInterface(bNodeTree *ntree, bNodeSocket *sock);
@ -598,7 +595,7 @@ void ntreeClearSocketCategories(bNodeTree *ntree);
/**
* Move a socket category up or down in the node tree.
* \param index Index to which to move the category.
* \param index: Index to which to move the category.
*/
void ntreeMoveSocketCategory(bNodeTree *ntree, bNodeSocketCategory *category, int new_index);