Revision: 56845
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56845
Author: lukastoenne
Date: 2013-05-16 10:01:34 +0000 (Thu, 16 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56610 (manual merge)
Modified Paths:
--------------
tags/blender-2.67a-release/blender/release/scripts/startup/nodeitems_builtins.py
Modified:
tags/blender-2.67a-release/blender/release/scripts/startup/nodeitems_builtins.py
===================================================================
---
tags/blender-2.67a-release/blender/release/scripts/startup/nodeitems_builtins.py
2013-05-16 09:57:05 UTC (rev 56844)
+++
tags/blender-2.67a-release/blender/release/scripts/startup/nodeitems_builtins.py
2013-05-16 10:01:34 UTC (rev 56845)
@@ -48,16 +48,16 @@
def compositor_node_group_items(self):
- return [NodeItem('CompositorNodeGroup', group.name, { "node_tree" :
"bpy.data.node_groups['%s']" % group.name })
+ 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']
# 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['%s']" % group.name })
+ 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 texture_node_group_items(self):
- return [NodeItem('TextureNodeGroup', group.name, { "node_tree" :
"bpy.data.node_groups['%s']" % group.name })
+ 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']
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
