Fix bpy.utils.script_paths ignoring user_pref arg

2019-05-09 13:21:53 +10:00 · 2019-05-09 13:21:53 +10:00 · be7031bee3
parent 33f495bd52
commit be7031bee3
1 changed files with 5 additions and 4 deletions
--- 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: