RNA: naming, user-preferences -> preferences

10 files changed, 26 insertions, 26 deletions

diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py
index c0d45822503..ef5ec77a6c5 100644
--- a/release/scripts/modules/addon_utils.py
+++ b/release/scripts/modules/addon_utils.py
@@ -30,7 +30,7 @@ __all__ = (
 )
 
 import bpy as _bpy
-_user_preferences = _bpy.context.user_preferences
+_preferences = _bpy.context.preferences
 
 error_encoding = False
 # (name, file, path)
@@ -43,7 +43,7 @@ def _initialize():
     path_list = paths()
     for path in path_list:
         _bpy.utils._sys_path_ensure(path)
-    for addon in _user_preferences.addons:
+    for addon in _preferences.addons:
         enable(addon.module)
 
 
@@ -231,7 +231,7 @@ def check(module_name):
     :rtype: tuple of booleans
     """
     import sys
-    loaded_default = module_name in _user_preferences.addons
+    loaded_default = module_name in _preferences.addons
 
     mod = sys.modules.get(module_name)
     loaded_state = (
@@ -258,7 +258,7 @@ def check(module_name):
 
 
 def _addon_ensure(module_name):
-    addons = _user_preferences.addons
+    addons = _preferences.addons
     addon = addons.get(module_name)
     if not addon:
         addon = addons.new()
@@ -266,7 +266,7 @@ def _addon_ensure(module_name):
 
 
 def _addon_remove(module_name):
-    addons = _user_preferences.addons
+    addons = _preferences.addons
 
     while module_name in addons:
         addon = addons.get(module_name)
diff --git a/release/scripts/modules/bl_app_template_utils.py b/release/scripts/modules/bl_app_template_utils.py
index 66ed7327b31..c00ac6a50b1 100644
--- a/release/scripts/modules/bl_app_template_utils.py
+++ b/release/scripts/modules/bl_app_template_utils.py
@@ -33,7 +33,7 @@ __all__ = (
 
 import bpy as _bpy
 
-# Normally matches 'user_preferences.app_template_id',
+# Normally matches 'preferences.app_template_id',
 # but loading new preferences will get us out of sync.
 _app_template = {
     "id": "",
@@ -184,7 +184,7 @@ def reset(*, reload_scripts=False):
     """
     Sets default state.
     """
-    template_id = _bpy.context.user_preferences.app_template
+    template_id = _bpy.context.preferences.app_template
     if _bpy.app.debug_python:
         print("bl_app_template_utils.reset('%s')" % template_id)
 
diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py
index 55a210c56ed..1db0beabb92 100644
--- a/release/scripts/modules/bl_i18n_utils/utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils.py
@@ -178,8 +178,8 @@ def enable_addons(addons=None, support=None, disable=False, check_only=False):
     if support is None:
         support = {}
 
-    userpref = bpy.context.user_preferences
-    used_ext = {ext.module for ext in userpref.addons}
+    prefs = bpy.context.preferences
+    used_ext = {ext.module for ext in prefs.addons}
 
     ret = [
         mod for mod in addon_utils.modules()
diff --git a/release/scripts/modules/bl_previews_utils/bl_previews_render.py b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
index 084937f0369..55cbd128183 100644
--- a/release/scripts/modules/bl_previews_utils/bl_previews_render.py
+++ b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
@@ -485,11 +485,11 @@ def main():
                         help="Do not generate/clear previews for mat/tex/image/etc. IDs (those handled by core Blender code).")
     args = parser.parse_args(argv)
 
-    orig_save_version = bpy.context.user_preferences.filepaths.save_version
+    orig_save_version = bpy.context.preferences.filepaths.save_version
     if args.no_backups:
-        bpy.context.user_preferences.filepaths.save_version = 0
+        bpy.context.preferences.filepaths.save_version = 0
     elif orig_save_version < 1:
-        bpy.context.user_preferences.filepaths.save_version = 1
+        bpy.context.preferences.filepaths.save_version = 1
 
     if args.clear:
         print("clear!")
@@ -501,7 +501,7 @@ def main():
                     do_data_intern=args.no_data_intern)
 
     # Not really necessary, but better be consistent.
-    bpy.context.user_preferences.filepaths.save_version = orig_save_version
+    bpy.context.preferences.filepaths.save_version = orig_save_version
 
 
 if __name__ == "__main__":
diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py
index 75044d9d85c..5fbff2eb51b 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -71,7 +71,7 @@ import sys as _sys
 
 import addon_utils as _addon_utils
 
-_user_preferences = _bpy.context.user_preferences
+_preferences = _bpy.context.preferences
 _script_module_dirs = "startup", "modules"
 _is_factory_startup = _bpy.app.factory_startup
 
@@ -176,7 +176,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
         # to reload. note that they will only actually reload of the
         # modification time changes. This `won't` work for packages so...
         # its not perfect.
-        for module_name in [ext.module for ext in _user_preferences.addons]:
+        for module_name in [ext.module for ext in _preferences.addons]:
             _addon_utils.disable(module_name)
 
     def register_module_call(mod):
@@ -308,7 +308,7 @@ def script_path_user():
 
 def script_path_pref():
     """returns the user preference or None"""
-    path = _user_preferences.filepaths.script_directory
+    path = _preferences.filepaths.script_directory
     return _os.path.normpath(path) if path else None
 
 
@@ -572,7 +572,7 @@ def preset_find(name, preset_path, display_name=False, ext=".py"):
 def keyconfig_init():
     # Key configuration initialization and refresh, called from the Blender
     # window manager on startup and refresh.
-    active_config = _user_preferences.inputs.active_keyconfig
+    active_config = _preferences.inputs.active_keyconfig
 
     # Load the default key configuration.
     default_filepath = preset_find("blender", "keyconfig")
diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py
index ea7a4a5cd57..5e8f497d1a0 100644
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -67,7 +67,7 @@ def add_object_align_init(context, operator):
             properties.location = location.to_translation()
 
     # rotation
-    view_align = (context.user_preferences.edit.object_align == 'VIEW')
+    view_align = (context.preferences.edit.object_align == 'VIEW')
     view_align_force = False
     if operator:
         if properties.is_property_set("view_align"):
@@ -135,7 +135,7 @@ def object_data_add(context, obdata, operator=None, name=None):
 
     # XXX
     # caused because entering edit-mode does not add a empty undo slot!
-    if context.user_preferences.edit.use_enter_edit_mode:
+    if context.preferences.edit.use_enter_edit_mode:
         if not (obj_act and
                 obj_act.mode == 'EDIT' and
                 obj_act.type == obj_new.type):
@@ -174,7 +174,7 @@ def object_data_add(context, obdata, operator=None, name=None):
         bpy.ops.object.mode_set(mode='EDIT')
     else:
         layer.objects.active = obj_new
-        if context.user_preferences.edit.use_enter_edit_mode:
+        if context.preferences.edit.use_enter_edit_mode:
             bpy.ops.object.mode_set(mode='EDIT')
 
     return obj_new
diff --git a/release/scripts/modules/bpy_restrict_state.py b/release/scripts/modules/bpy_restrict_state.py
index 589b3960b04..7ad9e0ec0a8 100644
--- a/release/scripts/modules/bpy_restrict_state.py
+++ b/release/scripts/modules/bpy_restrict_state.py
@@ -33,14 +33,14 @@ class _RestrictContext:
     __slots__ = ()
     _real_data = _bpy.data
     # safe, the pointer never changes
-    _real_pref = _bpy.context.user_preferences
+    _real_pref = _bpy.context.preferences
 
     @property
     def window_manager(self):
         return self._real_data.window_managers[0]
 
     @property
-    def user_preferences(self):
+    def preferences(self):
         return self._real_pref
 
 
diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py
index 756dbde23c9..3a44745e01b 100644
--- a/release/scripts/modules/rna_keymap_ui.py
+++ b/release/scripts/modules/rna_keymap_ui.py
@@ -413,8 +413,8 @@ def draw_keymaps(context, layout):
             box = col.box()
             row = box.row(align=True)
 
-            userpref = context.user_preferences
-            inputs = userpref.inputs
+            prefs = context.preferences
+            inputs = prefs.inputs
             show_ui_keyconfig = inputs.show_ui_keyconfig
             row.prop(
                 inputs,
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py
index f08390cfd6d..88c3f37fbaf 100644
--- a/release/scripts/modules/rna_prop_ui.py
+++ b/release/scripts/modules/rna_prop_ui.py
@@ -148,7 +148,7 @@ def draw(layout, context, context_member, property_type, use_edit=True):
         props.data_path = context_member
         del row
 
-    show_developer_ui = context.user_preferences.view.show_developer_ui
+    show_developer_ui = context.preferences.view.show_developer_ui
     rna_properties = {prop.identifier for prop in rna_item.bl_rna.properties if prop.is_runtime} if items else None
 
     layout.use_property_split = True
diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index 53b3197fca3..8b4e224efe4 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -227,7 +227,7 @@ def write_sysinfo(filepath):
             import addon_utils
             addon_utils.modules()
             output.write(title("Enabled add-ons"))
-            for addon in bpy.context.user_preferences.addons.keys():
+            for addon in bpy.context.preferences.addons.keys():
                 addon_mod = addon_utils.addons_fake_modules.get(addon, None)
                 if addon_mod is None:
                     output.write("%s (MISSING)\n" % (addon))