[Bf-blender-cvs] [a51fc1b] object_nodes: Fix for node groups: operator for creating a new tree was hard-wired to geometry nodes.

Lukas Tönne noreply at git.blender.org
Wed Dec 23 17:12:36 CET 2015


Commit: a51fc1b993208aa20c1c538702d69aa133cff1fe
Author: Lukas Tönne
Date:   Wed Dec 23 17:12:09 2015 +0100
Branches: object_nodes
https://developer.blender.org/rBa51fc1b993208aa20c1c538702d69aa133cff1fe

Fix for node groups: operator for creating a new tree was hard-wired to geometry nodes.

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

M	release/scripts/nodes/geometry_nodes.py
M	release/scripts/nodes/group_nodes.py
M	release/scripts/nodes/instancing_nodes.py

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

diff --git a/release/scripts/nodes/geometry_nodes.py b/release/scripts/nodes/geometry_nodes.py
index af7d5cd..9d7e3c5 100644
--- a/release/scripts/nodes/geometry_nodes.py
+++ b/release/scripts/nodes/geometry_nodes.py
@@ -350,7 +350,7 @@ class GeometryNodesNew(Operator):
 ###############################################################################
 
 def register():
-    gnode, ginput, goutput = group_nodes.make_node_group_types("Geometry", GeometryNodeTree, GeometryNodeBase)
+    gnode, ginput, goutput = group_nodes.make_node_group_types("Geometry", GeometryNodeTree, GeometryNodeBase, "object_nodes.geometry_nodes_new")
     bpy.utils.register_module(__name__)
 
     node_categories = [
diff --git a/release/scripts/nodes/group_nodes.py b/release/scripts/nodes/group_nodes.py
index 91834ec..d2d9815 100644
--- a/release/scripts/nodes/group_nodes.py
+++ b/release/scripts/nodes/group_nodes.py
@@ -179,7 +179,7 @@ def make_node_group_interface(prefix, treetype, tree_items_update):
 
 ###############################################################################
 
-def make_node_group_types(prefix, treetype, node_base):
+def make_node_group_types(prefix, treetype, node_base, op_tree_new):
     ntree_idname = treetype.bl_idname
     groupnode_idname = '%sGroupNode' % prefix
 
@@ -296,7 +296,7 @@ def make_node_group_types(prefix, treetype, node_base):
             return True
 
         def draw_buttons(self, context, layout):
-            layout.template_ID(self, "id", new="object_nodes.geometry_nodes_new")
+            layout.template_ID(self, "id", new=op_tree_new)
 
         def compile_dependencies(self, depsnode):
             ntree = self.id
diff --git a/release/scripts/nodes/instancing_nodes.py b/release/scripts/nodes/instancing_nodes.py
index bd21a54..8010ccf 100644
--- a/release/scripts/nodes/instancing_nodes.py
+++ b/release/scripts/nodes/instancing_nodes.py
@@ -167,7 +167,7 @@ class InstancingNodesNew(Operator):
 ###############################################################################
 
 def register():
-    gnode, ginput, goutput = group_nodes.make_node_group_types("Instancing", InstancingNodeTree, InstancingNodeBase)
+    gnode, ginput, goutput = group_nodes.make_node_group_types("Instancing", InstancingNodeTree, InstancingNodeBase, "object_nodes.instancing_nodes_new")
     bpy.utils.register_module(__name__)
 
     node_categories = [




More information about the Bf-blender-cvs mailing list