[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57120] tags/blender-2.67b-release/blender /release/scripts: svn merge ^/trunk/blender -c56594 -c56595 -c56596
Lukas Toenne
lukas.toenne at googlemail.com
Wed May 29 19:00:39 CEST 2013
Revision: 57120
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57120
Author: lukastoenne
Date: 2013-05-29 17:00:38 +0000 (Wed, 29 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56594 -c56595 -c56596
Modified Paths:
--------------
tags/blender-2.67b-release/blender/release/scripts/modules/nodeitems_utils.py
tags/blender-2.67b-release/blender/release/scripts/startup/nodeitems_builtins.py
Modified: tags/blender-2.67b-release/blender/release/scripts/modules/nodeitems_utils.py
===================================================================
--- tags/blender-2.67b-release/blender/release/scripts/modules/nodeitems_utils.py 2013-05-29 16:21:50 UTC (rev 57119)
+++ tags/blender-2.67b-release/blender/release/scripts/modules/nodeitems_utils.py 2013-05-29 17:00:38 UTC (rev 57120)
@@ -26,21 +26,17 @@
def poll(cls, context):
return True
- @property
- def items(self):
- if hasattr(self, '_items'):
- return self._items
- elif hasattr(self, '_itemfunc'):
- return self._itemfunc(self)
-
- def __init__(self, identifier, name, description="", items=[]):
+ def __init__(self, identifier, name, description="", items=None):
self.identifier = identifier
self.name = name
self.description = description
- if callable(items):
- self._itemfunc = items
+
+ if items is None:
+ self.items = lambda context: []
+ elif callable(items):
+ self.items = items
else:
- self._items = items
+ self.items = lambda context: items
class NodeItem():
def __init__(self, nodetype, label=None, settings={}):
@@ -69,7 +65,7 @@
layout = self.layout
col = layout.column()
default_context = bpy.app.translations.contexts.default
- for item in self.category.items:
+ for item in self.category.items(context):
op = col.operator("node.add_node", text=item.label, text_ctxt=default_context)
op.type = item.nodetype
op.use_transform = True
Modified: tags/blender-2.67b-release/blender/release/scripts/startup/nodeitems_builtins.py
===================================================================
--- tags/blender-2.67b-release/blender/release/scripts/startup/nodeitems_builtins.py 2013-05-29 16:21:50 UTC (rev 57119)
+++ tags/blender-2.67b-release/blender/release/scripts/startup/nodeitems_builtins.py 2013-05-29 17:00:38 UTC (rev 57120)
@@ -17,7 +17,6 @@
# ##### END GPL LICENSE BLOCK #####
# <pep8 compliant>
-import bpy
import nodeitems_utils
from nodeitems_utils import NodeCategory, NodeItem
@@ -47,20 +46,41 @@
return context.space_data.tree_type == 'TextureNodeTree'
-def compositor_node_group_items(self):
- return [NodeItem('CompositorNodeGroup', group.name, { "node_tree" : "bpy.data.node_groups[%r]" % group.name })
- for group in bpy.data.node_groups if group.bl_idname == 'CompositorNodeTree']
+# maps node tree type to group node type
+node_tree_group_type = {
+ 'CompositorNodeTree' : 'CompositorNodeGroup',
+ 'ShaderNodeTree' : 'ShaderNodeGroup',
+ 'TextureNodeTree' : 'TextureNodeGroup',
+ }
+# generic node group items generator for shader, compositor and texture node groups
+def node_group_items(context):
+ space = context.space_data
+ if not space:
+ return
+ ntree = space.edit_tree
+ if not ntree:
+ return
-# Note: node groups not distinguished by old/new shader nodes
-def shader_node_group_items(self):
- return [NodeItem('ShaderNodeGroup', group.name, { "node_tree" : "bpy.data.node_groups[%r]" % group.name })
- for group in bpy.data.node_groups if group.bl_idname == 'ShaderNodeTree']
+ def contains_group(nodetree, group):
+ if nodetree == group:
+ return True
+ else:
+ for node in nodetree.nodes:
+ if node.bl_idname in node_tree_group_type.values() and node.node_tree is not None:
+ if contains_group(node.node_tree, group):
+ return True
+ return False
-def texture_node_group_items(self):
- return [NodeItem('TextureNodeGroup', group.name, { "node_tree" : "bpy.data.node_groups[%r]" % group.name })
- for group in bpy.data.node_groups if group.bl_idname == 'TextureNodeTree']
+ for group in context.blend_data.node_groups:
+ if group.bl_idname != ntree.bl_idname:
+ continue
+ # filter out recursive groups
+ if contains_group(group, ntree):
+ continue
+ yield NodeItem(node_tree_group_type[group.bl_idname], group.name, { "node_tree" : "bpy.data.node_groups[%r]" % group.name })
+
# All standard node categories currently used in nodes.
shader_node_categories = [
@@ -99,7 +119,7 @@
]),
ShaderOldNodeCategory("SH_SCRIPT", "Script", items=[
]),
- ShaderOldNodeCategory("SH_GROUP", "Group", items=shader_node_group_items),
+ ShaderOldNodeCategory("SH_GROUP", "Group", items=node_group_items),
ShaderOldNodeCategory("SH_LAYOUT", "Layout", items=[
NodeItem("NodeFrame"),
]),
@@ -182,7 +202,7 @@
ShaderNewNodeCategory("SH_NEW_SCRIPT", "Script", items=[
NodeItem("ShaderNodeScript"),
]),
- ShaderNewNodeCategory("SH_NEW_GROUP", "Group", items=shader_node_group_items),
+ ShaderNewNodeCategory("SH_NEW_GROUP", "Group", items=node_group_items),
ShaderNewNodeCategory("SH_NEW_LAYOUT", "Layout", items=[
NodeItem("NodeFrame"),
]),
@@ -287,7 +307,7 @@
NodeItem("CompositorNodeTransform"),
NodeItem("CompositorNodeStabilize"),
]),
- CompositorNodeCategory("CMP_GROUP", "Group", items=compositor_node_group_items),
+ CompositorNodeCategory("CMP_GROUP", "Group", items=node_group_items),
CompositorNodeCategory("CMP_LAYOUT", "Layout", items = [
NodeItem("NodeFrame"),
NodeItem("CompositorNodeSwitch"),
@@ -342,7 +362,7 @@
NodeItem("TextureNodeTranslate"),
NodeItem("TextureNodeRotate"),
]),
- TextureNodeCategory("TEX_GROUP", "Group", items=texture_node_group_items),
+ TextureNodeCategory("TEX_GROUP", "Group", items=node_group_items),
TextureNodeCategory("TEX_LAYOUT", "Layout", items = [
NodeItem("NodeFrame"),
]),
More information about the Bf-blender-cvs
mailing list