[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4433] contrib/py/scripts/addons/ node_efficiency_tools.py: Code Clean Up:
Bartek Skorupa
bartekskorupa at bartekskorupa.com
Tue Mar 26 20:59:11 CET 2013
Revision: 4433
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4433
Author: bartekskorupa
Date: 2013-03-26 19:59:10 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
Code Clean Up:
- Cleaner handling of keymap items
- Removed some trash (not needed commented lines)
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-26 17:27:21 UTC (rev 4432)
+++ contrib/py/scripts/addons/node_efficiency_tools.py 2013-03-26 19:59:10 UTC (rev 4433)
@@ -1461,8 +1461,6 @@
props.replace = False
props.use_node_name = False
props.use_outputs_names = True
- #layout.operator(NodesLinkActiveToSelected.bl_idname, text="Replace Links").option = 'True False True'
- #layout.operator(NodesLinkActiveToSelected.bl_idname, text="Don't Replace Links").option = 'False False True'
class NodeAlignMenu(bpy.types.Menu):
@@ -1494,135 +1492,148 @@
#############################################################
addon_keymaps = []
-kmi_defs_merge_nodes = (
+# kmi_defs entry: (identifier, key, CTRL, SHIFT, ALT, props)
+# props entry: (property name, property value)
+kmi_defs = (
# MERGE NODES
# MergeNodes with Ctrl (AUTO).
- (MergeNodes.bl_idname, 'NUMPAD_0', 'MIX', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'ZERO', 'MIX', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'NUMPAD_PLUS', 'ADD', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'EQUAL', 'ADD', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'NUMPAD_ASTERIX', 'MULTIPLY', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'EIGHT', 'MULTIPLY', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'NUMPAD_MINUS', 'SUBTRACT', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'MINUS', 'SUBTRACT', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'NUMPAD_SLASH', 'DIVIDE', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'SLASH', 'DIVIDE', 'AUTO', True, False, False),
- (MergeNodes.bl_idname, 'COMMA', 'LESS_THAN', 'MATH', True, False, False),
- (MergeNodes.bl_idname, 'PERIOD', 'GREATER_THAN', 'MATH', True, False, False),
+ (MergeNodes.bl_idname, 'NUMPAD_0', True, False, False,\
+ (('mode', 'MIX'), ('merge_type', 'AUTO'),)),
+ (MergeNodes.bl_idname, 'EQUAL', True, False, False,\
+ (('mode', 'MIX'), ('merge_type', 'AUTO'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_ASTERIX', True, False, False,\
+ (('mode', 'MULTIPLY'), ('merge_type', 'AUTO'),)),
+ (MergeNodes.bl_idname, 'EIGHT', True, False, False,\
+ (('mode', 'MULTIPLY'), ('merge_type', 'AUTO'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_MINUS', True, False, False,\
+ (('mode', 'SUBTRACT'), ('merge_type', 'AUTO'),)),
+ (MergeNodes.bl_idname, 'MINUS', True, False, False,\
+ (('mode', 'SUBTRACT'), ('merge_type', 'AUTO'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_SLASH', True, False, False,\
+ (('mode', 'DIVIDE'), ('merge_type', 'AUTO'),)),
+ (MergeNodes.bl_idname, 'SLASH', True, False, False,\
+ (('mode', 'DIVIDE'), ('merge_type', 'AUTO'),)),
+ (MergeNodes.bl_idname, 'COMMA', True, False, False,\
+ (('mode', 'LESS_THAN'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'PERIOD', True, False, False,\
+ (('mode', 'GREATER_THAN'), ('merge_type', 'MATH'),)),
# MergeNodes with Ctrl Alt (MIX)
- (MergeNodes.bl_idname, 'NUMPAD_0', 'MIX', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'ZERO', 'MIX', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'NUMPAD_PLUS', 'ADD', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'EQUAL', 'ADD', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'NUMPAD_ASTERIX', 'MULTIPLY', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'EIGHT', 'MULTIPLY', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'NUMPAD_MINUS', 'SUBTRACT', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'MINUS', 'SUBTRACT', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'NUMPAD_SLASH', 'DIVIDE', 'MIX', True, False, True),
- (MergeNodes.bl_idname, 'SLASH', 'DIVIDE', 'MIX', True, False, True),
+ (MergeNodes.bl_idname, 'NUMPAD_0', True, False, True,\
+ (('mode', 'MIX'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'ZERO', True, False, True,\
+ (('mode', 'MIX'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_PLUS', True, False, True,\
+ (('mode', 'ADD'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'EQUAL', True, False, True,\
+ (('mode', 'ADD'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_ASTERIX', True, False, True,\
+ (('mode', 'MULTIPLY'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'EIGHT', True, False, True,\
+ (('mode', 'MULTIPLY'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_MINUS', True, False, True,\
+ (('mode', 'SUBTRACT'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'MINUS', True, False, True,\
+ (('mode', 'SUBTRACT'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_SLASH', True, False, True,\
+ (('mode', 'DIVIDE'), ('merge_type', 'MIX'),)),
+ (MergeNodes.bl_idname, 'SLASH', True, False, True,\
+ (('mode', 'DIVIDE'), ('merge_type', 'MIX'),)),
# MergeNodes with Ctrl Shift (MATH)
- (MergeNodes.bl_idname, 'NUMPAD_0', 'MIX', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'ZERO', 'MIX', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'NUMPAD_PLUS', 'ADD', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'EQUAL', 'ADD', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'NUMPAD_ASTERIX', 'MULTIPLY', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'EIGHT', 'MULTIPLY', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'NUMPAD_MINUS', 'SUBTRACT', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'MINUS', 'SUBTRACT', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'NUMPAD_SLASH', 'DIVIDE', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'SLASH', 'DIVIDE', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'COMMA', 'LESS_THAN', 'MATH', True, True, False),
- (MergeNodes.bl_idname, 'PERIOD', 'GREATER_THAN', 'MATH', True, True, False),
- )
-kmi_defs_batch_change = (
+ (MergeNodes.bl_idname, 'NUMPAD_PLUS', True, True, False,\
+ (('mode', 'ADD'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'EQUAL', True, True, False,\
+ (('mode', 'ADD'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_ASTERIX', True, True, False,\
+ (('mode', 'MULTIPLY'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'EIGHT', True, True, False,\
+ (('mode', 'MULTIPLY'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_MINUS', True, True, False,\
+ (('mode', 'SUBTRACT'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'MINUS', True, True, False,\
+ (('mode', 'SUBTRACT'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'NUMPAD_SLASH', True, True, False,\
+ (('mode', 'DIVIDE'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'SLASH', True, True, False,\
+ (('mode', 'DIVIDE'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'COMMA', True, True, False,\
+ (('mode', 'LESS_THAN'), ('merge_type', 'MATH'),)),
+ (MergeNodes.bl_idname, 'PERIOD', True, True, False,\
+ (('mode', 'GREATER_THAN'), ('merge_type', 'MATH'),)),
# BATCH CHANGE NODES
# BatchChangeNodes with Alt
- (BatchChangeNodes.bl_idname, 'NUMPAD_0', 'MIX', 'CURRENT', False, False, True),
- (BatchChangeNodes.bl_idname, 'ZERO', 'MIX', 'CURRENT', False, False, True),
- (BatchChangeNodes.bl_idname, 'NUMPAD_PLUS', 'ADD', 'ADD', False, False, True),
- (BatchChangeNodes.bl_idname, 'EQUAL', 'ADD', 'ADD', False, False, True),
- (BatchChangeNodes.bl_idname, 'NUMPAD_ASTERIX', 'MULTIPLY', 'MULTIPLY', False, False, True),
- (BatchChangeNodes.bl_idname, 'EIGHT', 'MULTIPLY', 'MULTIPLY', False, False, True),
- (BatchChangeNodes.bl_idname, 'NUMPAD_MINUS', 'SUBTRACT', 'SUBTRACT', False, False, True),
- (BatchChangeNodes.bl_idname, 'MINUS', 'SUBTRACT', 'SUBTRACT', False, False, True),
- (BatchChangeNodes.bl_idname, 'NUMPAD_SLASH', 'DIVIDE', 'DIVIDE', False, False, True),
- (BatchChangeNodes.bl_idname, 'SLASH', 'DIVIDE', 'DIVIDE', False, False, True),
- (BatchChangeNodes.bl_idname, 'COMMA', 'CURRENT', 'LESS_THAN', False, False, True),
- (BatchChangeNodes.bl_idname, 'PERIOD', 'CURRENT', 'GREATER_THAN', False, False, True),
- (BatchChangeNodes.bl_idname, 'DOWN_ARROW', 'NEXT', 'NEXT', False, False, True),
- (BatchChangeNodes.bl_idname, 'UP_ARROW', 'PREV', 'PREV', False, False, True),
- )
-kmi_defs_link_active_to_selected = (
+ (BatchChangeNodes.bl_idname, 'NUMPAD_0', False, False, True,\
+ (('blend_type', 'MIX'), ('operation', 'CURRENT'),)),
+ (BatchChangeNodes.bl_idname, 'ZERO', False, False, True,\
+ (('blend_type', 'MIX'), ('operation', 'CURRENT'),)),
+ (BatchChangeNodes.bl_idname, 'NUMPAD_PLUS', False, False, True,\
+ (('blend_type', 'ADD'), ('operation', 'ADD'),)),
+ (BatchChangeNodes.bl_idname, 'EQUAL', False, False, True,\
+ (('blend_type', 'ADD'), ('operation', 'ADD'),)),
+ (BatchChangeNodes.bl_idname, 'NUMPAD_ASTERIX', False, False, True,\
+ (('blend_type', 'MULTIPLY'), ('operation', 'MULTIPLY'),)),
+ (BatchChangeNodes.bl_idname, 'EIGHT', False, False, True,\
+ (('blend_type', 'MULTIPLY'), ('operation', 'MULTIPLY'),)),
+ (BatchChangeNodes.bl_idname, 'NUMPAD_MINUS', False, False, True,\
+ (('blend_type', 'SUBTRACT'), ('operation', 'SUBTRACT'),)),
+ (BatchChangeNodes.bl_idname, 'MINUS', False, False, True,\
+ (('blend_type', 'SUBTRACT'), ('operation', 'SUBTRACT'),)),
+ (BatchChangeNodes.bl_idname, 'NUMPAD_SLASH', False, False, True,\
+ (('blend_type', 'DIVIDE'), ('operation', 'DIVIDE'),)),
+ (BatchChangeNodes.bl_idname, 'SLASH', False, False, True,\
+ (('blend_type', 'DIVIDE'), ('operation', 'DIVIDE'),)),
+ (BatchChangeNodes.bl_idname, 'COMMA', False, False, True,\
+ (('blend_type', 'CURRENT'), ('operation', 'LESS_THAN'),)),
+ (BatchChangeNodes.bl_idname, 'PERIOD', False, False, True,\
+ (('blend_type', 'CURRENT'), ('operation', 'GREATER_THAN'),)),
+ (BatchChangeNodes.bl_idname, 'DOWN_ARROW', False, False, True,\
+ (('blend_type', 'NEXT'), ('operation', 'NEXT'),)),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list