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>2019-05-09 06:21:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-09 06:23:05 +0300
commitbe7031bee348c27ecc92b1bf9e2046f1108a7301 (patch)
tree5818a8abb234a35dea5468ce7bb6e341fe3e8b01 /release/scripts/modules/bpy/utils/__init__.py
parent33f495bd52e01ecac526394c16f4a81f964411cc (diff)
Fix bpy.utils.script_paths ignoring user_pref arg
Diffstat (limited to 'release/scripts/modules/bpy/utils/__init__.py')
-rw-r--r--release/scripts/modules/bpy/utils/__init__.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py
index 86eea422cf9..d3e0ecc729d 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -353,10 +353,11 @@ def script_paths(subdir=None, user_pref=True, check_all=False, use_user=True):
*base_paths,
)
- if use_user:
- test_paths = (*base_paths, script_path_user(), script_path_pref())
- else:
- test_paths = (*base_paths, script_path_pref())
+ test_paths = (
+ *base_paths,
+ *((script_path_user(),) if use_user else ()),
+ *((script_path_pref(),) if user_pref else ()),
+ )
for path in test_paths:
if path: