[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4435] contrib/py/scripts/addons/ node_efficiency_tools.py: minor code cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Mar 27 11:17:08 CET 2013
Revision: 4435
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4435
Author: campbellbarton
Date: 2013-03-27 10:17:08 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
minor code cleanup
Modified Paths:
--------------
contrib/py/scripts/addons/node_efficiency_tools.py
Modified: contrib/py/scripts/addons/node_efficiency_tools.py
===================================================================
--- contrib/py/scripts/addons/node_efficiency_tools.py 2013-03-27 07:50:47 UTC (rev 4434)
+++ contrib/py/scripts/addons/node_efficiency_tools.py 2013-03-27 10:17:08 UTC (rev 4435)
@@ -30,6 +30,7 @@
}
import bpy
+from bpy.types import Operator, Panel, Menu
from bpy.props import FloatProperty, EnumProperty, BoolProperty
#################
@@ -163,7 +164,7 @@
return space.type == 'NODE_EDITOR' and space.node_tree is not None
-class MergeNodes(bpy.types.Operator, NodeToolBase):
+class MergeNodes(Operator, NodeToolBase):
bl_idname = "node.merge_nodes"
bl_label = "Merge Nodes"
bl_description = "Merge Selected Nodes"
@@ -304,7 +305,7 @@
return {'FINISHED'}
-class BatchChangeNodes(bpy.types.Operator, NodeToolBase):
+class BatchChangeNodes(Operator, NodeToolBase):
bl_idname = "node.batch_change"
bl_label = "Batch Change"
bl_description = "Batch Change Blend Type and Math Operation"
@@ -366,7 +367,7 @@
return {'FINISHED'}
-class ChangeMixFactor(bpy.types.Operator, NodeToolBase):
+class ChangeMixFactor(Operator, NodeToolBase):
bl_idname = "node.factor"
bl_label = "Change Factor"
bl_description = "Change Factors of Mix Nodes and Mix Shader Nodes"
@@ -397,7 +398,7 @@
return {'FINISHED'}
-class NodesCopySettings(bpy.types.Operator):
+class NodesCopySettings(Operator):
bl_idname = "node.copy_settings"
bl_label = "Copy Settings"
bl_description = "Copy Settings of Active Node to Selected Nodes"
@@ -475,7 +476,7 @@
return {'FINISHED'}
-class NodesCopyLabel(bpy.types.Operator, NodeToolBase):
+class NodesCopyLabel(Operator, NodeToolBase):
bl_idname = "node.copy_label"
bl_label = "Copy Label"
bl_options = {'REGISTER', 'UNDO'}
@@ -519,7 +520,7 @@
return {'FINISHED'}
-class NodesClearLabel(bpy.types.Operator, NodeToolBase):
+class NodesClearLabel(Operator, NodeToolBase):
bl_idname = "node.clear_label"
bl_label = "Clear Label"
bl_options = {'REGISTER', 'UNDO'}
@@ -540,7 +541,7 @@
return context.window_manager.invoke_confirm(self, event)
-class NodesAddTextureSetup(bpy.types.Operator):
+class NodesAddTextureSetup(Operator):
bl_idname = "node.add_texture"
bl_label = "Texture Setup"
bl_description = "Add Texture Node Setup to Selected Shaders"
@@ -594,7 +595,7 @@
return {'FINISHED'}
-class NodesAddReroutes(bpy.types.Operator, NodeToolBase):
+class NodesAddReroutes(Operator, NodeToolBase):
bl_idname = "node.add_reroutes"
bl_label = "Add Reroutes"
bl_description = "Add Reroutes to Outputs"
@@ -665,9 +666,9 @@
pass_used = getattr(node_scene.render.layers[node_layer], render_pass)
break
if pass_used:
- valid = (option == 'all') or\
- (option == 'loose' and not output.links) or\
- (option == 'linked' and output.links)
+ valid = ((option == 'all') or
+ (option == 'loose' and not output.links) or
+ (option == 'linked' and output.links))
# Add reroutes only if valid, but offset location in all cases.
if valid:
n = nodes.new('NodeReroute')
@@ -693,7 +694,7 @@
return {'FINISHED'}
-class NodesSwap(bpy.types.Operator, NodeToolBase):
+class NodesSwap(Operator, NodeToolBase):
bl_idname = "node.swap_nodes"
bl_label = "Swap Nodes"
bl_options = {'REGISTER', 'UNDO'}
@@ -819,7 +820,7 @@
return {'FINISHED'}
-class NodesLinkActiveToSelected(bpy.types.Operator):
+class NodesLinkActiveToSelected(Operator):
bl_idname = "node.link_active_to_selected"
bl_label = "Link Active Node to Selected"
bl_options = {'REGISTER', 'UNDO'}
@@ -900,7 +901,7 @@
return {'FINISHED'}
-class AlignNodes(bpy.types.Operator, NodeToolBase):
+class AlignNodes(Operator, NodeToolBase):
bl_idname = "node.align_nodes"
bl_label = "Align nodes"
bl_options = {'REGISTER', 'UNDO'}
@@ -1020,7 +1021,7 @@
return {'FINISHED'}
-class SelectParentChildren(bpy.types.Operator, NodeToolBase):
+class SelectParentChildren(Operator, NodeToolBase):
bl_idname = "node.select_parent_child"
bl_label = "Select Parent or Children"
bl_options = {'REGISTER', 'UNDO'}
@@ -1055,7 +1056,7 @@
# P A N E L S
#############################################################
-class EfficiencyToolsPanel(bpy.types.Panel, NodeToolBase):
+class EfficiencyToolsPanel(Panel, NodeToolBase):
bl_idname = "NODE_PT_efficiency_tools"
bl_space_type = 'NODE_EDITOR'
bl_region_type = 'UI'
@@ -1068,40 +1069,40 @@
box = layout.box()
box.menu(MergeNodesMenu.bl_idname)
if type == 'ShaderNodeTree':
- box.operator(NodesAddTextureSetup.bl_idname, text = 'Add Image Texture (Ctrl T)')
- box.menu(BatchChangeNodesMenu.bl_idname, text = 'Batch Change...')
- box.menu(NodeAlignMenu.bl_idname, text = "Align Nodes (Shift =)")
- box.menu(CopyToSelectedMenu.bl_idname, text = 'Copy to Selected (Shift-C)')
+ box.operator(NodesAddTextureSetup.bl_idname, text="Add Image Texture (Ctrl T)")
+ box.menu(BatchChangeNodesMenu.bl_idname, text="Batch Change...")
+ box.menu(NodeAlignMenu.bl_idname, text="Align Nodes (Shift =)")
+ box.menu(CopyToSelectedMenu.bl_idname, text="Copy to Selected (Shift-C)")
box.operator(NodesClearLabel.bl_idname).option = True
- box.menu(AddReroutesMenu.bl_idname, text = 'Add Reroutes')
- box.menu(NodesSwapMenu.bl_idname, text = 'Swap Nodes')
- box.menu(LinkActiveToSelectedMenu.bl_idname, text = 'Link Active To Selected')
+ box.menu(AddReroutesMenu.bl_idname, text="Add Reroutes")
+ box.menu(NodesSwapMenu.bl_idname, text="Swap Nodes")
+ box.menu(LinkActiveToSelectedMenu.bl_idname, text="Link Active To Selected")
#############################################################
# M E N U S
#############################################################
-class EfficiencyToolsMenu(bpy.types.Menu, NodeToolBase):
+class EfficiencyToolsMenu(Menu, NodeToolBase):
bl_idname = "NODE_MT_node_tools_menu"
bl_label = "Efficiency Tools"
def draw(self, context):
type = context.space_data.tree_type
layout = self.layout
- layout.menu(MergeNodesMenu.bl_idname, text = 'Merge Selected Nodes')
+ layout.menu(MergeNodesMenu.bl_idname, text="Merge Selected Nodes")
if type == 'ShaderNodeTree':
- layout.operator(NodesAddTextureSetup.bl_idname, text = 'Add Image Texture with coordinates')
- layout.menu(BatchChangeNodesMenu.bl_idname, text = 'Batch Change')
+ layout.operator(NodesAddTextureSetup.bl_idname, text="Add Image Texture with coordinates")
+ layout.menu(BatchChangeNodesMenu.bl_idname, text="Batch Change")
layout.menu(NodeAlignMenu.bl_idname, text="Align Nodes")
- layout.menu(CopyToSelectedMenu.bl_idname, text = 'Copy to Selected')
+ layout.menu(CopyToSelectedMenu.bl_idname, text="Copy to Selected")
layout.operator(NodesClearLabel.bl_idname).option = True
- layout.menu(AddReroutesMenu.bl_idname, text = 'Add Reroutes')
- layout.menu(NodesSwapMenu.bl_idname, text = 'Swap Nodes')
- layout.menu(LinkActiveToSelectedMenu.bl_idname, text = 'Link Active To Selected')
+ layout.menu(AddReroutesMenu.bl_idname, text="Add Reroutes")
+ layout.menu(NodesSwapMenu.bl_idname, text="Swap Nodes")
+ layout.menu(LinkActiveToSelectedMenu.bl_idname, text="Link Active To Selected")
-class MergeNodesMenu(bpy.types.Menu, NodeToolBase):
+class MergeNodesMenu(Menu, NodeToolBase):
bl_idname = "NODE_MT_merge_nodes_menu"
bl_label = "Merge Selected Nodes"
@@ -1109,48 +1110,48 @@
type = context.space_data.tree_type
layout = self.layout
if type == 'ShaderNodeTree':
- layout.menu(MergeShadersMenu.bl_idname, text = 'Use Shaders')
+ layout.menu(MergeShadersMenu.bl_idname, text="Use Shaders")
layout.menu(MergeMixMenu.bl_idname, text="Use Mix Nodes")
layout.menu(MergeMathMenu.bl_idname, text="Use Math Nodes")
-class MergeShadersMenu(bpy.types.Menu, NodeToolBase):
+class MergeShadersMenu(Menu, NodeToolBase):
bl_idname = "NODE_MT_merge_shaders_menu"
bl_label = "Merge Selected Nodes using Shaders"
def draw(self, context):
layout = self.layout
for type in merge_shaders:
- props = layout.operator(MergeNodes.bl_idname, text = type)
+ props = layout.operator(MergeNodes.bl_idname, text=type)
props.mode = type
props.merge_type = 'SHADER'
-class MergeMixMenu(bpy.types.Menu, NodeToolBase):
+class MergeMixMenu(Menu, NodeToolBase):
bl_idname = "NODE_MT_merge_mix_menu"
bl_label = "Merge Selected Nodes using Mix"
def draw(self, context):
layout = self.layout
for type, name, description in blend_types:
- props = layout.operator(MergeNodes.bl_idname, text = name)
+ props = layout.operator(MergeNodes.bl_idname, text=name)
props.mode = type
props.merge_type = 'MIX'
-class MergeMathMenu(bpy.types.Menu, NodeToolBase):
+class MergeMathMenu(Menu, NodeToolBase):
bl_idname = "NODE_MT_merge_math_menu"
bl_label = "Merge Selected Nodes using Math"
def draw(self, context):
layout = self.layout
for type, name, description in operations:
- props = layout.operator(MergeNodes.bl_idname, text = name)
+ props = layout.operator(MergeNodes.bl_idname, text=name)
props.mode = type
props.merge_type = 'MATH'
-class BatchChangeNodesMenu(bpy.types.Menu, NodeToolBase):
+class BatchChangeNodesMenu(Menu, NodeToolBase):
bl_idname = "NODE_MT_batch_change_nodes_menu"
bl_label = "Batch Change Selected Nodes"
@@ -1160,64 +1161,64 @@
layout.menu(BatchChangeOperationMenu.bl_idname)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list