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

add the modules directory from the user scripts path (if it exists)

Browse Source
This commit is contained in:
Campbell Barton
2010-04-16 09:31:58 +00:00
parent 182587fce1
commit 7eb4eebe22
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
release/scripts/modules/bpy/utils.py
View File

@@ -168,21 +168,20 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
traceback.print_exc() traceback.print_exc()
_loaded[:] = [] _loaded[:] = []
for base_path in script_paths(user=False): user_path = user_script_path()
for path_subdir in ("ui", "op", "io", "cfg", "keyingsets"):
for base_path in script_paths():
for path_subdir in ("", "ui", "op", "io", "cfg", "keyingsets", "modules"):
path = _os.path.join(base_path, path_subdir) path = _os.path.join(base_path, path_subdir)
if _os.path.isdir(path): if _os.path.isdir(path):
sys_path_ensure(path) sys_path_ensure(path)
for mod in modules_from_path(path, loaded_modules): # only add this to sys.modules, dont run
test_register(mod) if path_subdir == "modules":
continue
user_path = user_script_path() if user_path != base_path and path_subdir == "":
if user_path: continue # avoid loading 2.4x scripts
for path_subdir in ("", "ui", "op", "io", "cfg", "keyingsets"):
path = _os.path.join(user_path, path_subdir)
if _os.path.isdir(path):
sys_path_ensure(path)
for mod in modules_from_path(path, loaded_modules): for mod in modules_from_path(path, loaded_modules):
test_register(mod) test_register(mod)