Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2011-09-23 17:29:28 +0400
committerThomas Dinges <blender@dingto.org>2011-09-23 17:29:28 +0400
commitf7c8ea702f4736371e50c4d3066de46d17f4d686 (patch)
treed75d17428ddbb1cf5f7e71ef97780ef7a1e218f9 /release/scripts/startup/bl_ui
parenta7891da84bfad1f0cd0f3fc825e7f4dedf469a00 (diff)
* Some more fixes for recent move operator commit.
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r--release/scripts/startup/bl_ui/__init__.py3
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py8
2 files changed, 3 insertions, 8 deletions
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()