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:
authorCampbell Barton <ideasman42@gmail.com>2010-01-30 17:48:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-01-30 17:48:46 +0300
commit026b5bacca3b2aa0f6dc20e10d74b59faeeb4961 (patch)
tree456440968af7c4f9987b9fa4f2274a3b3ca69dc5 /release
parent147e7829796cd0057e1952bd5dc78b05ae3a0da7 (diff)
bugfix [#20638] not loading script in user script directory when startup
Diffstat (limited to 'release')
-rw-r--r--release/scripts/modules/bpy/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index 38de95aa6e4..dee1b36592f 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -72,7 +72,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
test_reload(_sys.modules[module_name])
for base_path in script_paths():
- for path_subdir in ("ui", "op", "io", "cfg"):
+ for path_subdir in ("", "ui", "op", "io", "cfg"):
path = _os.path.join(base_path, path_subdir)
if _os.path.isdir(path):
@@ -87,7 +87,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
if f.endswith(".py"):
# python module
mod = test_import(f[0:-3])
- elif "." not in f:
+ elif ("." not in f) and (_os.path.isdir(_os.path.join(path, f, "__init__.py"))):
# python package
mod = test_import(f)
else: