[Bf-extensions-cvs] [3a6f082] master: fix for reg error, tab unreg error, reported by Severin in irc

[meta-androcto]

Commit: 3a6f0825834df6642f9821677ca7f0526fa0e5cb
Author: meta-androcto
Date:   Tue Sep 13 22:05:17 2016 +1000
Branches: master
https://developer.blender.org/rBA3a6f0825834df6642f9821677ca7f0526fa0e5cb

fix for reg error, tab unreg error, reported by Severin in irc

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

M	pie_menus_official/__init__.py
M	pie_menus_official/pie_object_modes_of.py

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

diff --git a/pie_menus_official/__init__.py b/pie_menus_official/__init__.py
index 3bf000e..4c6d908 100644
--- a/pie_menus_official/__init__.py
+++ b/pie_menus_official/__init__.py
@@ -217,22 +217,18 @@ classes = (
     UIToolsPreferences,
     )
 
-def register_modules(dummy):
-    if dummy:
-        prefs = get_addon_preferences()
-        for mod in sub_modules:
-            name = mod.__name__.split('.')[-1]
-            if getattr(prefs, 'use_' + name, False):
-                register_submodule(mod)
-            else:
-                mod.__addon_enabled__ = False
-    return None
 
 def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
-    register_modules(True)
+    prefs = get_addon_preferences()
+    for mod in sub_modules:
+        if not hasattr(mod, '__addon_enabled__'):
+            mod.__addon_enabled__ = False
+        name = mod.__name__.split('.')[-1]
+        if getattr(prefs, 'use_' + name):
+            register_submodule(mod)
 
 
 def unregister():
diff --git a/pie_menus_official/pie_object_modes_of.py b/pie_menus_official/pie_object_modes_of.py
index 87c14ef..ac6a065 100644
--- a/pie_menus_official/pie_object_modes_of.py
+++ b/pie_menus_official/pie_object_modes_of.py
@@ -35,7 +35,7 @@ classes = [
 addon_keymaps = []
 
 def register():
-    addon_keymaps.clear()
+
     for cls in classes:
         bpy.utils.register_class(cls)
     wm = bpy.context.window_manager
@@ -55,7 +55,6 @@ def register():
 
 
 def unregister():
-    addon_keymaps.clear()
     for cls in classes:
         bpy.utils.unregister_class(cls)
     wm = bpy.context.window_manager