archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 32886.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-11-05 21:49:36 +00:00
parent aa7575c008 e8501edae2
commit 43f4dbceb4
552 changed files with 14432 additions and 21005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
release/scripts/ui/space_userpref.py
View File

@@ -838,13 +838,21 @@ class USERPREF_PT_addons(bpy.types.Panel):
modules = []
loaded_modules = set()
# RELEASE SCRIPTS: official scripts distributed in Blender releases
paths = bpy.utils.script_paths("addons")
# if folder addons_contrib/ exists, scripts in there will be loaded
# CONTRIB SCRIPTS: good for testing but not official scripts yet
# if folder addons_contrib/ exists, scripts in there will be loaded too
paths += bpy.utils.script_paths("addons_contrib")
# EXTERN SCRIPTS: external projects scripts
# if folder addons_extern/ exists, scripts in there will be loaded too
paths += bpy.utils.script_paths("addons_extern")
if bpy.app.debug:
t_main = time.time()
# fake module importing
def fake_module(mod_name, mod_path, speedy=True):
if bpy.app.debug: