[Bf-extensions-cvs] [4d41b47] master: Fix T42238: Some addons were trying to define shortcuts in background mode.

[Bastien Montagne]

Commit: 4d41b4702656524de58458068aee92049c668d40
Author: Bastien Montagne
Date:   Wed Oct 15 12:21:44 2014 +0200
Branches: master
https://developer.blender.org/rBA4d41b4702656524de58458068aee92049c668d40

Fix T42238: Some addons were trying to define shortcuts in background mode.

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

M	io_coat3D/__init__.py
M	io_coat3D/coat.py
M	node_efficiency_tools.py

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

diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py
index aef1011..3db5b51 100644
--- a/io_coat3D/__init__.py
+++ b/io_coat3D/__init__.py
@@ -19,7 +19,7 @@
 bl_info = {
     "name": "3D-Coat Applink",
     "author": "Kalle-Samuli Riihikoski (haikalle)",
-    "version": (3, 5, 20),
+    "version": (3, 5, 21),
     "blender": (2, 59, 0),
     "location": "Scene > 3D-Coat Applink",
     "description": "Transfer data between 3D-Coat/Blender",
diff --git a/io_coat3D/coat.py b/io_coat3D/coat.py
index 49f20e7..f80ccf5 100644
--- a/io_coat3D/coat.py
+++ b/io_coat3D/coat.py
@@ -603,21 +603,23 @@ class VIEW3D_MT_ExtraMenu(bpy.types.Menu):
 def register():
     bpy.utils.register_module(__name__)
 
-    wm = bpy.context.window_manager
-    km = wm.keyconfigs.addon.keymaps.new(name='3D View', space_type='VIEW_3D')
-    kmi = km.keymap_items.new('wm.call_menu2', 'Q', 'PRESS')
-    kmi.properties.name = "VIEW3D_MT_Coat_Dynamic_Menu"
+    kc = bpy.context.window_manager.keyconfigs.addon
+    if kc:
+        km = kc.keymaps.new(name='3D View', space_type='VIEW_3D')
+        kmi = km.keymap_items.new('wm.call_menu2', 'Q', 'PRESS')
+        kmi.properties.name = "VIEW3D_MT_Coat_Dynamic_Menu"
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    wm = bpy.context.window_manager
-    km = wm.keyconfigs.addon.keymaps['3D View']
-    for kmi in km.keymap_items:
-        if kmi.idname == '':
-            if kmi.properties.name == "VIEW3D_MT_Coat_Dynamic_Menu":
-                km.keymap_items.remove(kmi)
-                break
+    kc = bpy.context.window_manager.keyconfigs.addon
+    if kc:
+        km = kc.keymapskeymaps['3D View']
+        for kmi in km.keymap_items:
+            if kmi.idname == '':
+                if kmi.properties.name == "VIEW3D_MT_Coat_Dynamic_Menu":
+                    km.keymap_items.remove(kmi)
+                    break
 
 
 if __name__ == "__main__":
diff --git a/node_efficiency_tools.py b/node_efficiency_tools.py
index 719b8e9..de008aa 100644
--- a/node_efficiency_tools.py
+++ b/node_efficiency_tools.py
@@ -19,7 +19,7 @@
 bl_info = {
     "name": "Node Wrangler (aka Nodes Efficiency Tools)",
     "author": "Bartek Skorupa, Greg Zaal",
-    "version": (3, 15),
+    "version": (3, 16),
     "blender": (2, 72, 0),
     "location": "Node Editor Properties Panel or Ctrl-Space",
     "description": "Various tools to enhance and speed up node-based workflow",
@@ -3689,13 +3689,16 @@ def register():
     bpy.utils.register_module(__name__)
 
     # keymaps
-    km = bpy.context.window_manager.keyconfigs.addon.keymaps.new(name='Node Editor', space_type="NODE_EDITOR")
-    for (identifier, key, CTRL, SHIFT, ALT, props, nicename) in kmi_defs:
-        kmi = km.keymap_items.new(identifier, key, 'PRESS', ctrl=CTRL, shift=SHIFT, alt=ALT)
-        if props:
-            for prop, value in props:
-                setattr(kmi.properties, prop, value)
-        addon_keymaps.append((km, kmi))
+    addon_keymaps.clear()
+    kc = bpy.context.window_manager.keyconfigs.addon
+    if kc:
+        km = kc.keymaps.new(name='Node Editor', space_type="NODE_EDITOR")
+        for (identifier, key, CTRL, SHIFT, ALT, props, nicename) in kmi_defs:
+            kmi = km.keymap_items.new(identifier, key, 'PRESS', ctrl=CTRL, shift=SHIFT, alt=ALT)
+            if props:
+                for prop, value in props:
+                    setattr(kmi.properties, prop, value)
+            addon_keymaps.append((km, kmi))
 
     # menu items
     bpy.types.NODE_MT_select.append(select_parent_children_buttons)