[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40495] trunk/blender/release/scripts: * Some more fixes for recent move operator commit.
Thomas Dinges
blender at dingto.org
Fri Sep 23 15:29:29 CEST 2011
Revision: 40495
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40495
Author: dingto
Date: 2011-09-23 13:29:28 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
* Some more fixes for recent move operator commit.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/addon_utils.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/release/scripts/startup/bl_ui/__init__.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
Modified: trunk/blender/release/scripts/modules/addon_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/addon_utils.py 2011-09-23 13:20:21 UTC (rev 40494)
+++ trunk/blender/release/scripts/modules/addon_utils.py 2011-09-23 13:29:28 UTC (rev 40495)
@@ -34,7 +34,12 @@
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
paths = _bpy.utils.script_paths("addons")
Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py 2011-09-23 13:20:21 UTC (rev 40494)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py 2011-09-23 13:29:28 UTC (rev 40495)
@@ -1725,7 +1725,7 @@
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 @@
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 @@
# 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 @@
@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 @@
# 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()
Modified: trunk/blender/release/scripts/startup/bl_ui/__init__.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/__init__.py 2011-09-23 13:20:21 UTC (rev 40494)
+++ trunk/blender/release/scripts/startup/bl_ui/__init__.py 2011-09-23 13:29:28 UTC (rev 40495)
@@ -77,6 +77,7 @@
import bpy
+import addon_utils
def register():
@@ -96,7 +97,7 @@
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"])
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2011-09-23 13:20:21 UTC (rev 40494)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2011-09-23 13:29:28 UTC (rev 40495)
@@ -891,18 +891,12 @@
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 @@
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()
More information about the Bf-blender-cvs
mailing list