diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-29 12:33:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-29 12:33:13 +0400 |
commit | bd21001aaf69339ff9f4848134a59b2f58b9cf12 (patch) | |
tree | c7fb96ff09faedaa37447c3a2a980f843698bf09 /release/scripts/modules/bpy | |
parent | acb0a50fb314c6ab38bfbfce84ec0ab71f03603c (diff) |
fix for bug where user scripts path set by an environment variable would write presets there but not show up in the menu.
Diffstat (limited to 'release/scripts/modules/bpy')
-rw-r--r-- | release/scripts/modules/bpy/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index da12975e4a6..43e4bea4bb3 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -253,8 +253,8 @@ _scripts = (_os.path.normpath(_scripts), ) def user_script_path(): - prefs = _bpy.context.user_preferences - path = prefs.filepaths.script_directory + # returns the env var and falls back to userprefs + path = _user_resource('SCRIPTS') if path: path = _os.path.normpath(path) @@ -281,7 +281,7 @@ def script_paths(subdir=None, user_pref=True, check_all=False): prefs = _bpy.context.user_preferences # add user scripts dir - user_script = prefs.filepaths.script_directory if user_pref else None + user_script = user_script_path() if check_all: # all possible paths |