From 4003409430404c1be91d44460a770dfc9ce46135 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 27 Jul 2017 22:22:26 +1000 Subject: Fix factory setup using user scripts path still --- release/scripts/modules/bpy/utils/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'release/scripts') diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py index 6d3e807c2b4..966a1fe877c 100644 --- a/release/scripts/modules/bpy/utils/__init__.py +++ b/release/scripts/modules/bpy/utils/__init__.py @@ -331,6 +331,10 @@ def script_paths(subdir=None, user_pref=True, check_all=False, use_user=True): # so the 'BLENDER_SYSTEM_SCRIPTS' environment variable will be used. base_paths = _bpy_script_paths() + # Defined to be (system, user) so we can skip the second if needed. + if not use_user: + base_paths = base_paths[:1] + if check_all: # All possible paths, no duplicates, keep order. if use_user: -- cgit v1.2.3 From 2eb2655181b2d90457cb829d0ad285f193ad5e5c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 29 Jul 2017 01:28:58 +1000 Subject: Cleanup: clear deprecated UI flags Also adds cursor-lock flag, to be used in next commit. --- release/scripts/startup/bl_ui/space_userpref.py | 1 + 1 file changed, 1 insertion(+) (limited to 'release/scripts') diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 03a40085172..117b59d6d2f 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -249,6 +249,7 @@ class USERPREF_PT_interface(Panel): col = row.column() col.label(text="View Manipulation:") col.prop(view, "use_mouse_depth_cursor") + col.prop(view, "use_cursor_lock_adjust") col.prop(view, "use_mouse_depth_navigate") col.prop(view, "use_zoom_to_mouse") col.prop(view, "use_rotate_around_active") -- cgit v1.2.3