Fix bpy.utils.script_paths ignoring user_pref arg
authorCampbell Barton <ideasman42@gmail.com>
Thu, 9 May 2019 03:21:53 +0000 (13:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 9 May 2019 03:23:05 +0000 (13:23 +1000)
release/scripts/modules/bpy/utils/__init__.py

index 86eea42..d3e0ecc 100644 (file)
@@ -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: