diff options
author | Thomas Dinges <blender@dingto.org> | 2011-09-23 17:29:28 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2011-09-23 17:29:28 +0400 |
commit | f7c8ea702f4736371e50c4d3066de46d17f4d686 (patch) | |
tree | d75d17428ddbb1cf5f7e71ef97780ef7a1e218f9 /release/scripts | |
parent | a7891da84bfad1f0cd0f3fc825e7f4dedf469a00 (diff) |
* Some more fixes for recent move operator commit.
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/modules/addon_utils.py | 5 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 10 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/__init__.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index 0c5ef69e805..9d0f540b08b 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -34,6 +34,11 @@ import bpy as _bpy error_duplicates = False error_encoding = False +_addons_fake_modules = {} + +def module_get(mod_name): + return _addons_fake_modules[mod_name] + def paths(): # RELEASE SCRIPTS: official scripts distributed in Blender releases diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 9b037f7dc09..46227b2f48d 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1725,7 +1725,7 @@ class WM_OT_addon_install(Operator): del pyfile_dir # done checking for exceptional case - addons_old = {mod.__name__ for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)} + addons_old = {mod.__name__ for mod in addon_utils.modules(addon_utils._addons_fake_modules)} #check to see if the file is in compressed format (.zip) if zipfile.is_zipfile(pyfile): @@ -1774,7 +1774,7 @@ class WM_OT_addon_install(Operator): traceback.print_exc() return {'CANCELLED'} - addons_new = {mod.__name__ for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)} - addons_old + addons_new = {mod.__name__ for mod in addon_utils.modules(addon_utils._addons_fake_modules)} - addons_old addons_new.discard("modules") # disable any addons we may have enabled previously and removed. @@ -1784,7 +1784,7 @@ class WM_OT_addon_install(Operator): # possible the zip contains multiple addons, we could disallow this # but for now just use the first - for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules): + for mod in addon_utils.modules(addon_utils._addons_fake_modules): if mod.__name__ in addons_new: info = addon_utils.module_bl_info(mod) @@ -1818,7 +1818,7 @@ class WM_OT_addon_remove(Operator): @staticmethod def path_from_addon(module): - for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules): + for mod in addon_utils.modules(addon_utils._addons_fake_modules): if mod.__name__ == module: filepath = mod.__file__ if os.path.exists(filepath): @@ -1873,7 +1873,7 @@ class WM_OT_addon_expand(Operator): # unlikely to fail, module should have already been imported try: # mod = __import__(module_name) - mod = USERPREF_PT_addons.module_get(module_name) + mod = addon_utils.module_get(module_name) except: import traceback traceback.print_exc() diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 778571632b2..04617243730 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -77,6 +77,7 @@ del _namespace import bpy +import addon_utils def register(): @@ -96,7 +97,7 @@ def register(): items_unique = set() - for mod in addon_utils.modules(space_userpref.USERPREF_PT_addons._addons_fake_modules): + for mod in addon_utils.modules(addon_utils._addons_fake_modules): info = addon_utils.module_bl_info(mod) items_unique.add(info["category"]) diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 9e55c8ad815..22c93e0d0e1 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -891,18 +891,12 @@ class USERPREF_PT_addons(Panel): bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} - _addons_fake_modules = {} - @classmethod def poll(cls, context): userpref = context.user_preferences return (userpref.active_section == 'ADDONS') @staticmethod - def module_get(mod_name): - return USERPREF_PT_addons._addons_fake_modules[mod_name] - - @staticmethod def is_user_addon(mod, user_addon_paths): if not user_addon_paths: user_script_path = bpy.utils.user_script_path() @@ -932,7 +926,7 @@ class USERPREF_PT_addons(Panel): used_ext = {ext.module for ext in userpref.addons} # collect the categories that can be filtered on - addons = [(mod, addon_utils.module_bl_info(mod)) for mod in addon_utils.modules(USERPREF_PT_addons._addons_fake_modules)] + addons = [(mod, addon_utils.module_bl_info(mod)) for mod in addon_utils.modules(addon_utils._addons_fake_modules)] split = layout.split(percentage=0.2) col = split.column() |