[Bf-blender-cvs] [4a6a755afde] temp-attribute-processor: support tab on attribute processor
Jacques Lucke
noreply at git.blender.org
Thu May 27 12:51:41 CEST 2021
Commit: 4a6a755afde0f8bbcf8268dacf0b04039d697024
Author: Jacques Lucke
Date: Mon May 24 16:50:32 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rB4a6a755afde0f8bbcf8268dacf0b04039d697024
support tab on attribute processor
===================================================================
M source/blender/editors/space_node/node_group.c
===================================================================
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c
index 335e2f93ff3..29c2ed8b8dc 100644
--- a/source/blender/editors/space_node/node_group.c
+++ b/source/blender/editors/space_node/node_group.c
@@ -77,7 +77,8 @@ static bool node_group_operator_active_poll(bContext *C)
"ShaderNodeTree",
"CompositorNodeTree",
"TextureNodeTree",
- "GeometryNodeTree")) {
+ "GeometryNodeTree",
+ "AttributeNodeTree")) {
return true;
}
}
@@ -147,18 +148,15 @@ static bNode *node_group_get_active(bContext *C, const char *node_idname)
static int node_group_edit_exec(bContext *C, wmOperator *op)
{
SpaceNode *snode = CTX_wm_space_node(C);
- const char *node_idname = node_group_idname(C);
const bool exit = RNA_boolean_get(op->ptr, "exit");
ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C));
- bNode *gnode = node_group_get_active(C, node_idname);
-
- if (gnode && !exit) {
- bNodeTree *ngroup = (bNodeTree *)gnode->id;
-
+ bNode *node = nodeGetActive(snode->edittree);
+ if (!exit && node != NULL && node->id != NULL && GS(node->id->name) == ID_NT) {
+ bNodeTree *ngroup = (bNodeTree *)node->id;
if (ngroup) {
- ED_node_tree_push(snode, ngroup, gnode);
+ ED_node_tree_push(snode, ngroup, node);
}
}
else {
More information about the Bf-blender-cvs
mailing list