[Bf-blender-cvs] [427ea6e4ec6] temp-attribute-processor: create attribute node group in attribute tree

Jacques Lucke noreply at git.blender.org
Fri May 28 13:43:47 CEST 2021


Commit: 427ea6e4ec6279fadf1311308233bad9a568f8b1
Author: Jacques Lucke
Date:   Fri May 28 12:16:59 2021 +0200
Branches: temp-attribute-processor
https://developer.blender.org/rB427ea6e4ec6279fadf1311308233bad9a568f8b1

create attribute node group in attribute tree

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

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 39bc38fbf78..67aa4005be3 100644
--- a/source/blender/editors/space_node/node_group.c
+++ b/source/blender/editors/space_node/node_group.c
@@ -105,26 +105,31 @@ static bool node_group_operator_editable(bContext *C)
 static const char *group_ntree_idname(bContext *C)
 {
   SpaceNode *snode = CTX_wm_space_node(C);
-  return snode->tree_idname;
+  bNodeTree *ntree = snode->edittree;
+  return ntree ? ntree->idname : "";
 }
 
 const char *node_group_idname(bContext *C)
 {
   SpaceNode *snode = CTX_wm_space_node(C);
+  bNodeTree *ntree = snode->edittree;
+  if (ntree == NULL) {
+    return "";
+  }
 
-  if (ED_node_is_shader(snode)) {
+  if (STREQ(ntree->idname, "ShaderNodeTree")) {
     return "ShaderNodeGroup";
   }
-  if (ED_node_is_compositor(snode)) {
+  if (STREQ(ntree->idname, "CompositorNodeTree")) {
     return "CompositorNodeGroup";
   }
-  if (ED_node_is_texture(snode)) {
+  if (STREQ(ntree->idname, "TextureNodeTree")) {
     return "TextureNodeGroup";
   }
-  if (ED_node_is_geometry(snode)) {
+  if (STREQ(ntree->idname, "GeometryNodeTree")) {
     return "GeometryNodeGroup";
   }
-  if (ED_node_is_attribute(snode)) {
+  if (STREQ(ntree->idname, "AttributeNodeTree")) {
     return "AttributeNodeGroup";
   }



More information about the Bf-blender-cvs mailing list