diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-28 18:46:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-28 18:46:27 +0300 |
| commit | c558763ef562d407384dba37ffab612099df4916 (patch) | |
| tree | cc510e6347f0ddc5d1811d7a21f19d23e263331f /release/scripts | |
| parent | e39dc48bd51c6ba5ba72f2ebdf66a91ac6630170 (diff) | |
| parent | e03883065042412347e7b72a4102532d7b1fc495 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/modules/bpy/utils/__init__.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 |
2 files changed, 5 insertions, 0 deletions
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: diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 25d0e430708..7a777194d83 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -250,6 +250,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") |