diff options
Diffstat (limited to 'release')
26 files changed, 138 insertions, 138 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)) diff --git a/release/scripts/presets/keyconfig/blender.py b/release/scripts/presets/keyconfig/blender.py index ff8edbdede7..9db6df35662 100644 --- a/release/scripts/presets/keyconfig/blender.py +++ b/release/scripts/presets/keyconfig/blender.py @@ -108,7 +108,7 @@ def load(): from bpy import context from bl_keymap_utils.io import keyconfig_init_from_data - prefs = context.user_preferences + prefs = context.preferences kc = context.window_manager.keyconfigs.new(idname) kc_prefs = kc.preferences diff --git a/release/scripts/presets/keyconfig/blender_27x.py b/release/scripts/presets/keyconfig/blender_27x.py index d60324f22d6..eaa5dda4457 100644 --- a/release/scripts/presets/keyconfig/blender_27x.py +++ b/release/scripts/presets/keyconfig/blender_27x.py @@ -45,7 +45,7 @@ def load(): from bpy import context from bl_keymap_utils.io import keyconfig_init_from_data - prefs = context.user_preferences + prefs = context.preferences kc = context.window_manager.keyconfigs.new(idname) kc_prefs = kc.preferences diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index dbaeea959a8..61d59502a98 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -317,13 +317,13 @@ def km_window(params): # NDOF settings op_menu("USERPREF_MT_ndof_settings", {"type": 'NDOF_BUTTON_MENU', "value": 'PRESS'}), ("wm.context_scale_float", {"type": 'NDOF_BUTTON_PLUS', "value": 'PRESS'}, - {"properties": [("data_path", 'user_preferences.inputs.ndof_sensitivity'), ("value", 1.1)]}), + {"properties": [("data_path", 'preferences.inputs.ndof_sensitivity'), ("value", 1.1)]}), ("wm.context_scale_float", {"type": 'NDOF_BUTTON_MINUS', "value": 'PRESS'}, - {"properties": [("data_path", 'user_preferences.inputs.ndof_sensitivity'), ("value", 1.0 / 1.1)]}), + {"properties": [("data_path", 'preferences.inputs.ndof_sensitivity'), ("value", 1.0 / 1.1)]}), ("wm.context_scale_float", {"type": 'NDOF_BUTTON_PLUS', "value": 'PRESS', "shift": True}, - {"properties": [("data_path", 'user_preferences.inputs.ndof_sensitivity'), ("value", 1.5)]}), + {"properties": [("data_path", 'preferences.inputs.ndof_sensitivity'), ("value", 1.5)]}), ("wm.context_scale_float", {"type": 'NDOF_BUTTON_MINUS', "value": 'PRESS', "shift": True}, - {"properties": [("data_path", 'user_preferences.inputs.ndof_sensitivity'), ("value", 2.0 / 3.0)]}), + {"properties": [("data_path", 'preferences.inputs.ndof_sensitivity'), ("value", 2.0 / 3.0)]}), ("info.reports_display_update", {"type": 'TIMER_REPORT', "value": 'ANY', "any": True}, None), ]) @@ -3011,7 +3011,7 @@ def km_grease_pencil_stroke_paint_mode(params): {"properties": [("data_path_primary", 'tool_settings.gpencil_paint.brush.size')]}), # Brush size ("wm.radial_control", {"type": 'F', "value": 'PRESS', "ctrl": True}, - {"properties": [("data_path_primary", 'user_preferences.edit.grease_pencil_eraser_radius')]}), + {"properties": [("data_path_primary", 'preferences.edit.grease_pencil_eraser_radius')]}), # Draw context menu op_menu("GPENCIL_MT_gpencil_draw_specials", params.context_menu_event), # Draw delete menu diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index 8fbc8182ad8..a3de2811750 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -37,7 +37,7 @@ class EditExternally(Operator): def _editor_guess(context): import sys - image_editor = context.user_preferences.filepaths.image_editor + image_editor = context.preferences.filepaths.image_editor # use image editor in the preferences when available. if not image_editor: @@ -189,7 +189,7 @@ class ProjectEdit(Operator): if bpy.data.is_saved: filepath = "//" + filepath else: - tmpdir = context.user_preferences.filepaths.temporary_directory + tmpdir = context.preferences.filepaths.temporary_directory filepath = os.path.join(tmpdir, "project_edit") obj = context.object diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py index 27c8487eaa9..3a7199120a6 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -79,7 +79,7 @@ class PlayRenderedAnim(Operator): scene = context.scene rd = scene.render - prefs = context.user_preferences + prefs = context.preferences fps_final = rd.fps / rd.fps_base preset = prefs.filepaths.animation_player_preset diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 4461812cc2e..81814f4ffcf 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -2015,7 +2015,7 @@ class WM_OT_addon_install(Operator): # don't use bpy.utils.script_paths("addons") because we may not be able to write to it. path_addons = bpy.utils.user_resource('SCRIPTS', "addons", create=True) else: - path_addons = context.user_preferences.filepaths.script_directory + path_addons = context.preferences.filepaths.script_directory if path_addons: path_addons = os.path.join(path_addons, "addons") @@ -2206,7 +2206,7 @@ class WM_OT_addon_expand(Operator): class WM_OT_addon_userpref_show(Operator): - """Show add-on user preferences""" + """Show add-on preferences""" bl_idname = "wm.addon_userpref_show" bl_label = "" bl_options = {'INTERNAL'} @@ -2227,7 +2227,7 @@ class WM_OT_addon_userpref_show(Operator): info = addon_utils.module_bl_info(mod) info["show_expanded"] = True - context.user_preferences.active_section = 'ADDONS' + context.preferences.active_section = 'ADDONS' context.window_manager.addon_filter = 'All' context.window_manager.addon_search = info["name"] bpy.ops.screen.userpref_show('INVOKE_DEFAULT') @@ -2454,7 +2454,7 @@ class WM_OT_studiolight_install(Operator): import traceback import shutil import pathlib - userpref = context.user_preferences + prefs = context.preferences filepaths = [pathlib.Path(self.directory, e.name) for e in self.files] path_studiolights = bpy.utils.user_resource('DATAFILES') @@ -2472,7 +2472,7 @@ class WM_OT_studiolight_install(Operator): for filepath in filepaths: shutil.copy(str(filepath), str(path_studiolights)) - userpref.studio_lights.load(str(path_studiolights.joinpath(filepath.name)), self.type) + prefs.studio_lights.load(str(path_studiolights.joinpath(filepath.name)), self.type) # print message msg = ( @@ -2503,7 +2503,7 @@ class WM_OT_studiolight_new(Operator): def execute(self, context): import pathlib - userpref = context.user_preferences + prefs = context.preferences wm = context.window_manager path_studiolights = bpy.utils.user_resource('DATAFILES') @@ -2525,11 +2525,11 @@ class WM_OT_studiolight_new(Operator): self.ask_overide = True return wm.invoke_props_dialog(self, width=600) else: - for studio_light in userpref.studio_lights: + for studio_light in prefs.studio_lights: if studio_light.name == self.filename + ".sl": bpy.ops.wm.studiolight_uninstall(index=studio_light.index) - userpref.studio_lights.new(path=finalpath) + prefs.studio_lights.new(path=finalpath) # print message msg = ( @@ -2564,8 +2564,8 @@ class WM_OT_studiolight_uninstall(Operator): def execute(self, context): import pathlib - userpref = context.user_preferences - for studio_light in userpref.studio_lights: + prefs = context.preferences + for studio_light in prefs.studio_lights: if studio_light.index == self.index: if studio_light.path: self._remove_path(pathlib.Path(studio_light.path)) @@ -2573,7 +2573,7 @@ class WM_OT_studiolight_uninstall(Operator): self._remove_path(pathlib.Path(studio_light.path_irr_cache)) if studio_light.path_sh_cache: self._remove_path(pathlib.Path(studio_light.path_sh_cache)) - userpref.studio_lights.remove(studio_light) + prefs.studio_lights.remove(studio_light) return {'FINISHED'} return {'CANCELLED'} @@ -2585,9 +2585,9 @@ class WM_OT_studiolight_copy_settings(Operator): index: bpy.props.IntProperty() def execute(self, context): - userpref = context.user_preferences - system = userpref.system - for studio_light in userpref.studio_lights: + prefs = context.preferences + system = prefs.system + for studio_light in prefs.studio_lights: if studio_light.index == self.index: system.light_ambient = studio_light.light_ambient for sys_light, light in zip(system.solid_lights, studio_light.solid_lights): @@ -2601,13 +2601,13 @@ class WM_OT_studiolight_copy_settings(Operator): class WM_OT_studiolight_userpref_show(Operator): - """Show light user preferences""" + """Show light preferences""" bl_idname = "wm.studiolight_userpref_show" bl_label = "" bl_options = {'INTERNAL'} def execute(self, context): - context.user_preferences.active_section = 'LIGHTS' + context.preferences.active_section = 'LIGHTS' bpy.ops.screen.userpref_show('INVOKE_DEFAULT') return {'FINISHED'} @@ -2617,7 +2617,7 @@ class WM_MT_splash(Menu): def draw_setup(self, context): wm = context.window_manager - # userpref = context.user_preferences + # prefs = context.preferences layout = self.layout @@ -2678,8 +2678,8 @@ class WM_MT_splash(Menu): #row = sub.row() #row.alignment = 'RIGHT' # row.label(text="Language:") - #userpref = context.user_preferences - #sub.prop(userpref.system, "language", text="") + #prefs = context.preferences + #sub.prop(prefs.system, "language", text="") # Keep height constant if not has_select_mouse: @@ -2705,7 +2705,7 @@ class WM_MT_splash(Menu): layout.separator() def draw(self, context): - # Draw setup screen if no user preferences have been saved yet. + # Draw setup screen if no preferences have been saved yet. import os user_path = bpy.utils.resource_path('USER') diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 32524ec092c..49d0b4075a1 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -129,7 +129,7 @@ class SceneKeyingSetsPanel: owner = ks propname = prop else: - owner = context.user_preferences.edit + owner = context.preferences.edit if userpref_fallback: propname = userpref_fallback else: @@ -137,7 +137,7 @@ class SceneKeyingSetsPanel: else: item = ks - owner = context.user_preferences.edit + owner = context.preferences.edit if userpref_fallback: propname = userpref_fallback else: diff --git a/release/scripts/startup/bl_ui/properties_workspace.py b/release/scripts/startup/bl_ui/properties_workspace.py index d07e2dbbaf6..daea94a3811 100644 --- a/release/scripts/startup/bl_ui/properties_workspace.py +++ b/release/scripts/startup/bl_ui/properties_workspace.py @@ -57,7 +57,7 @@ class WORKSPACE_PT_addons(WorkSpaceButtonsPanel, Panel): col = layout.box().column(align=True) workspace = context.workspace - userpref = context.user_preferences + prefs = context.preferences col.active = workspace.use_filter_by_owner @@ -65,7 +65,7 @@ class WORKSPACE_PT_addons(WorkSpaceButtonsPanel, Panel): addon_map = {mod.__name__: mod for mod in addon_utils.modules()} owner_ids = {owner_id.name for owner_id in workspace.owner_ids} - for addon in userpref.addons: + for addon in prefs.addons: module_name = addon.module info = addon_utils.module_bl_info(addon_map[module_name]) if not info["use_owner"]: diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index eb94adc1964..2eacae81057 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -141,7 +141,7 @@ class FILEBROWSER_PT_system_bookmarks(Panel): @classmethod def poll(cls, context): - return not context.user_preferences.filepaths.hide_system_bookmarks + return not context.preferences.filepaths.hide_system_bookmarks def draw(self, context): layout = self.layout @@ -203,7 +203,7 @@ class FILEBROWSER_PT_recent_folders(Panel): @classmethod def poll(cls, context): - return not context.user_preferences.filepaths.hide_recent_locations + return not context.preferences.filepaths.hide_recent_locations def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index 3be03ee8a80..0ae28ae38e7 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -47,7 +47,7 @@ class TIME_HT_editor_buttons(Header): # if using JACK and A/V sync: # hide the play-reversed button # since JACK transport doesn't support reversed playback - if scene.sync_mode == 'AUDIO_SYNC' and context.user_preferences.system.audio_device == 'JACK': + if scene.sync_mode == 'AUDIO_SYNC' and context.preferences.system.audio_device == 'JACK': sub = row.row(align=True) sub.scale_x = 1.4 sub.operator("screen.animation_play", text="", icon='PLAY') @@ -275,7 +275,7 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel): scene = context.scene tool_settings = context.tool_settings - userprefs = context.user_preferences + prefs = context.preferences col = layout.column(align=True) col.label(text="Active Keying Set:") @@ -293,7 +293,7 @@ class TIME_PT_keyframing_settings(TimelinePanelButtons, Panel): row = col.row() row.prop(tool_settings, "auto_keying_mode", text="") row.prop(tool_settings, "use_keyframe_insert_keyingset", text="") - if not userprefs.edit.use_keyframe_insert_available: + if not prefs.edit.use_keyframe_insert_available: col.prop(tool_settings, "use_record_with_nla", text="Layered Recording") layout.prop(tool_settings, "use_keyframe_cycle_aware") diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py index 9d13bd93c86..4d6a43aa141 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_common.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py @@ -431,7 +431,7 @@ class ToolSelectPanelHelper: """ # Currently this just checks the width, # we could have different layouts as preferences too. - system = bpy.context.user_preferences.system + system = bpy.context.preferences.system view2d = region.view2d view2d_scale = ( view2d.region_to_view(1.0, 0.0)[0] - diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index a4ca27e8f48..e7883ce0bac 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -195,8 +195,8 @@ class _defs_annotate: def eraser(): def draw_settings(context, layout, tool): # TODO: Move this setting to tool_settings - user_prefs = context.user_preferences - layout.prop(user_prefs.edit, "grease_pencil_eraser_radius", text="Radius") + prefs = context.preferences + layout.prop(prefs.edit, "grease_pencil_eraser_radius", text="Radius") return dict( text="Annotate Eraser", icon="ops.gpencil.draw.eraser", diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 67530ba71ee..6f80b4394b6 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -609,7 +609,7 @@ class TOPBAR_MT_file(Menu): layout.operator_context = 'INVOKE_AREA' if any(bpy.utils.app_template_paths()): - app_template = context.user_preferences.app_template + app_template = context.preferences.app_template else: app_template = None @@ -647,7 +647,7 @@ class TOPBAR_MT_file(Menu): layout.separator() layout.operator_context = 'EXEC_AREA' - if bpy.data.is_dirty and context.user_preferences.view.use_quit_dialog: + if bpy.data.is_dirty and context.preferences.view.use_quit_dialog: layout.operator_context = 'INVOKE_SCREEN' # quit dialog layout.operator("wm.quit_blender", text="Quit", icon='QUIT') @@ -894,7 +894,7 @@ class TOPBAR_MT_help(Menu): def draw(self, context): layout = self.layout - show_developer = context.user_preferences.view.show_developer_ui + show_developer = context.preferences.view.show_developer_ui layout.operator( "wm.url_open", text="Manual", icon='HELP', diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 541158796e5..c4198e02187 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -28,29 +28,29 @@ from bpy.app.translations import contexts as i18n_contexts class USERPREF_HT_header(Header): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' def draw(self, context): layout = self.layout layout.template_header() - userpref = context.user_preferences + prefs = context.preferences - if userpref.active_section == 'INPUT': + if prefs.active_section == 'INPUT': layout.operator("wm.keyconfig_import", icon='IMPORT') layout.operator("wm.keyconfig_export", icon='EXPORT') - elif userpref.active_section == 'ADDONS': + elif prefs.active_section == 'ADDONS': layout.operator("wm.addon_install", icon='FILEBROWSER') layout.operator("wm.addon_refresh", icon='FILE_REFRESH') layout.menu("USERPREF_MT_addons_online_resources") - elif userpref.active_section == 'LIGHTS': + elif prefs.active_section == 'LIGHTS': layout.operator("wm.studiolight_install", text="Add MatCap").type = 'MATCAP' layout.operator("wm.studiolight_install", text="Add LookDev HDRI").type = 'WORLD' op = layout.operator("wm.studiolight_install", text="Add Studio Light") op.type = 'STUDIO' op.filter_glob = ".sl" - elif userpref.active_section == 'THEMES': + elif prefs.active_section == 'THEMES': layout.operator("wm.theme_install", icon='FILEBROWSER') layout.operator("ui.reset_default_theme", icon='LOOP_BACK') @@ -62,38 +62,38 @@ class USERPREF_HT_header(Header): class USERPREF_PT_navigation(Panel): bl_label = "" - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_region_type = 'NAVIGATION_BAR' bl_options = {'HIDE_HEADER'} def draw(self, context): layout = self.layout - userpref = context.user_preferences + prefs = context.preferences col = layout.column() col.scale_x = 1.3 col.scale_y = 1.3 - col.prop(userpref, "active_section", expand=True) + col.prop(prefs, "active_section", expand=True) class USERPREF_PT_interface(Panel): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_label = "Interface" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @classmethod def poll(cls, context): - userpref = context.user_preferences - return (userpref.active_section == 'INTERFACE') + prefs = context.preferences + return (prefs.active_section == 'INTERFACE') def draw(self, context): layout = self.layout - userpref = context.user_preferences - view = userpref.view + prefs = context.preferences + view = prefs.view split = layout.split() row = split.row() @@ -212,21 +212,21 @@ class USERPREF_PT_interface(Panel): class USERPREF_PT_edit(Panel): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_label = "Edit" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @classmethod def poll(cls, context): - userpref = context.user_preferences - return (userpref.active_section == 'EDITING') + prefs = context.preferences + return (prefs.active_section == 'EDITING') def draw(self, context): layout = self.layout - userpref = context.user_preferences - edit = userpref.edit + prefs = context.preferences + edit = prefs.edit split = layout.split() row = split.row() @@ -341,22 +341,22 @@ class USERPREF_PT_edit(Panel): class USERPREF_PT_system_general(Panel): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_label = "System General" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @classmethod def poll(cls, context): - userpref = context.user_preferences - return (userpref.active_section == 'SYSTEM_GENERAL') + prefs = context.preferences + return (prefs.active_section == 'SYSTEM_GENERAL') def draw(self, context): import sys layout = self.layout - userpref = context.user_preferences - system = userpref.system + prefs = context.preferences + system = prefs.system split = layout.split() @@ -383,7 +383,7 @@ class USERPREF_PT_system_general(Panel): col.separator() if bpy.app.build_options.cycles: - addon = userpref.addons.get("cycles") + addon = prefs.addons.get("cycles") if addon is not None: addon.preferences.draw_impl(col, context) del addon @@ -490,8 +490,8 @@ class USERPREF_MT_interface_theme_presets(Menu): preset_operator = "script.execute_preset" preset_type = 'XML' preset_xml_map = ( - ("user_preferences.themes[0]", "Theme"), - ("user_preferences.ui_styles[0]", "ThemeStyle"), + ("preferences.themes[0]", "Theme"), + ("preferences.ui_styles[0]", "ThemeStyle"), ) draw = Menu.draw_preset @@ -500,7 +500,7 @@ class USERPREF_MT_interface_theme_presets(Menu): class USERPREF_PT_theme(Panel): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_label = "Themes" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -640,13 +640,13 @@ class USERPREF_PT_theme(Panel): @classmethod def poll(cls, context): - userpref = context.user_preferences - return (userpref.active_section == 'THEMES') + prefs = context.preferences + return (prefs.active_section == 'THEMES') def draw(self, context): layout = self.layout - theme = context.user_preferences.themes[0] + theme = context.preferences.themes[0] split_themes = layout.split(factor=0.2) @@ -864,7 +864,7 @@ class USERPREF_PT_theme(Panel): elif theme.theme_area == 'STYLE': col = split.column() - style = context.user_preferences.ui_styles[0] + style = context.preferences.ui_styles[0] col.label(text="Panel Title:") self._ui_font_style(col, style.panel_title) @@ -883,22 +883,22 @@ class USERPREF_PT_theme(Panel): class USERPREF_PT_file(Panel): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_label = "Files" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @classmethod def poll(cls, context): - userpref = context.user_preferences - return (userpref.active_section == 'SYSTEM_FILES') + prefs = context.preferences + return (prefs.active_section == 'SYSTEM_FILES') def draw(self, context): layout = self.layout - userpref = context.user_preferences - paths = userpref.filepaths - system = userpref.system + prefs = context.preferences + paths = prefs.filepaths + system = prefs.system split = layout.split(factor=0.7) @@ -949,7 +949,7 @@ class USERPREF_PT_file(Panel): row = box.row() row.label(text="Excluded Paths:") row.operator("wm.userpref_autoexec_path_add", text="", icon='ADD', emboss=False) - for i, path_cmp in enumerate(userpref.autoexec_paths): + for i, path_cmp in enumerate(prefs.autoexec_paths): row = box.row() row.prop(path_cmp, "path", text="") row.prop(path_cmp, "use_glob", text="", icon='FILTER') @@ -1002,7 +1002,7 @@ class USERPREF_MT_ndof_settings(Menu): def draw(self, context): layout = self.layout - input_prefs = context.user_preferences.inputs + input_prefs = context.preferences.inputs is_view3d = context.space_data.type == 'VIEW_3D' @@ -1052,15 +1052,15 @@ class USERPREF_MT_keyconfigs(Menu): class USERPREF_PT_input(Panel): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_label = "Input" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @classmethod def poll(cls, context): - userpref = context.user_preferences - return (userpref.active_section == 'INPUT') + prefs = context.preferences + return (prefs.active_section == 'INPUT') @staticmethod def draw_input_prefs(inputs, layout): @@ -1163,9 +1163,9 @@ class USERPREF_PT_input(Panel): #start = time.time() - userpref = context.user_preferences + prefs = context.preferences - inputs = userpref.inputs + inputs = prefs.inputs split = layout.split(factor=0.25) @@ -1212,7 +1212,7 @@ class USERPREF_MT_addons_online_resources(Menu): class USERPREF_PT_addons(Panel): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_label = "Add-ons" bl_region_type = 'WINDOW' bl_options = {'HIDE_HEADER'} @@ -1225,8 +1225,8 @@ class USERPREF_PT_addons(Panel): @classmethod def poll(cls, context): - userpref = context.user_preferences - return (userpref.active_section == 'ADDONS') + prefs = context.preferences + return (prefs.active_section == 'ADDONS') @staticmethod def is_user_addon(mod, user_addon_paths): @@ -1261,12 +1261,12 @@ class USERPREF_PT_addons(Panel): layout = self.layout - userpref = context.user_preferences - used_ext = {ext.module for ext in userpref.addons} + prefs = context.preferences + used_ext = {ext.module for ext in prefs.addons} addon_user_dirs = tuple( p for p in ( - os.path.join(userpref.filepaths.script_directory, "addons"), + os.path.join(prefs.filepaths.script_directory, "addons"), bpy.utils.user_resource('SCRIPTS', "addons"), ) if p @@ -1443,9 +1443,9 @@ class USERPREF_PT_addons(Panel): for _ in range(4 - tot_row): split.separator() - # Show addon user preferences + # Show addon preferences if is_enabled: - addon_preferences = userpref.addons[module_name].preferences + addon_preferences = prefs.addons[module_name].preferences if addon_preferences is not None: draw = getattr(addon_preferences, "draw", None) if draw is not None: @@ -1489,21 +1489,21 @@ class USERPREF_PT_addons(Panel): class StudioLightPanelMixin(): - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_region_type = 'WINDOW' @classmethod def poll(cls, context): - userpref = context.user_preferences - return (userpref.active_section == 'LIGHTS') + prefs = context.preferences + return (prefs.active_section == 'LIGHTS') - def _get_lights(self, userpref): - return [light for light in userpref.studio_lights if light.is_user_defined and light.type == self.sl_type] + def _get_lights(self, prefs): + return [light for light in prefs.studio_lights if light.is_user_defined and light.type == self.sl_type] def draw(self, context): layout = self.layout - userpref = context.user_preferences - lights = self._get_lights(userpref) + prefs = context.preferences + lights = self._get_lights(prefs) self.draw_light_list(layout, lights) @@ -1549,7 +1549,7 @@ class USERPREF_PT_studiolight_lights(Panel, StudioLightPanelMixin): class USERPREF_PT_studiolight_light_editor(Panel): bl_label = "Studio Light Editor" bl_parent_id = "USERPREF_PT_studiolight_lights" - bl_space_type = 'USER_PREFERENCES' + bl_space_type = 'PREFERENCES' bl_region_type = 'WINDOW' def opengl_light_buttons(self, layout, light): @@ -1566,8 +1566,8 @@ class USERPREF_PT_studiolight_light_editor(Panel): def draw(self, context): layout = self.layout - userpref = context.user_preferences - system = userpref.system + prefs = context.preferences + system = prefs.system row = layout.row() row.prop(system, "edit_studio_light", toggle=True) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c1b4849ddad..12ac3698359 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -4420,8 +4420,8 @@ class VIEW3D_PT_shading_lighting(Panel): sub = col.row() if shading.light == 'STUDIO': - userpref = context.user_preferences - system = userpref.system + prefs = context.preferences + system = prefs.system if not system.edit_studio_light: sub.scale_y = 0.6 # smaller studiolight preview @@ -5013,7 +5013,7 @@ class VIEW3D_PT_overlay_edit_mesh_developer(Panel): @classmethod def poll(cls, context): - return context.mode == 'EDIT_MESH' and context.user_preferences.view.show_developer_ui + return context.mode == 'EDIT_MESH' and context.preferences.view.show_developer_ui def draw(self, context): layout = self.layout diff --git a/release/scripts/templates_py/operator_modal_timer.py b/release/scripts/templates_py/operator_modal_timer.py index 12f1ebbc17d..808f1a1299c 100644 --- a/release/scripts/templates_py/operator_modal_timer.py +++ b/release/scripts/templates_py/operator_modal_timer.py @@ -15,7 +15,7 @@ class ModalTimerOperator(bpy.types.Operator): if event.type == 'TIMER': # change theme color, silly! - color = context.user_preferences.themes[0].view_3d.space.gradients.high_gradient + color = context.preferences.themes[0].view_3d.space.gradients.high_gradient color.s = 1.0 color.h += 0.01 |