[Bf-blender-cvs] [63fcbfc3a73] blender2.8: RNA: naming, user-preferences -> preferences
Campbell Barton
noreply at git.blender.org
Fri Dec 21 02:56:25 CET 2018
Commit: 63fcbfc3a7325d79b9e916457d64c302ddfeadfa
Author: Campbell Barton
Date: Fri Dec 21 12:47:44 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB63fcbfc3a7325d79b9e916457d64c302ddfeadfa
RNA: naming, user-preferences -> preferences
===================================================================
M doc/python_api/examples/bpy.types.AddonPreferences.1.py
M doc/python_api/sphinx_doc_gen.py
M intern/cycles/blender/addon/engine.py
M intern/cycles/blender/addon/ui.py
M intern/cycles/blender/addon/version_update.py
M intern/cycles/blender/blender_python.cpp
M intern/cycles/blender/blender_session.cpp
M intern/cycles/blender/blender_session.h
M intern/cycles/blender/blender_sync.cpp
M intern/cycles/blender/blender_sync.h
M release/scripts/modules/addon_utils.py
M release/scripts/modules/bl_app_template_utils.py
M release/scripts/modules/bl_i18n_utils/utils.py
M release/scripts/modules/bl_previews_utils/bl_previews_render.py
M release/scripts/modules/bpy/utils/__init__.py
M release/scripts/modules/bpy_extras/object_utils.py
M release/scripts/modules/bpy_restrict_state.py
M release/scripts/modules/rna_keymap_ui.py
M release/scripts/modules/rna_prop_ui.py
M release/scripts/modules/sys_info.py
M release/scripts/presets/keyconfig/blender.py
M release/scripts/presets/keyconfig/blender_27x.py
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_operators/image.py
M release/scripts/startup/bl_operators/screen_play_rendered_anim.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/properties_workspace.py
M release/scripts/startup/bl_ui/space_filebrowser.py
M release/scripts/startup/bl_ui/space_time.py
M release/scripts/startup/bl_ui/space_toolsystem_common.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/templates_py/operator_modal_timer.py
M source/blender/draw/engines/workbench/workbench_data.c
M source/blender/draw/engines/workbench/workbench_effect_taa.c
M source/blender/draw/engines/workbench/workbench_private.h
M source/blender/editors/screen/screen_ops.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_context.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/python/intern/bpy_rna_callback.c
M source/blender/windowmanager/intern/wm_files.c
M tests/python/bl_load_addons.py
M tests/python/bl_load_py_modules.py
===================================================================
diff --git a/doc/python_api/examples/bpy.types.AddonPreferences.1.py b/doc/python_api/examples/bpy.types.AddonPreferences.1.py
index e6c720e0fad..fdc073b3e2f 100644
--- a/doc/python_api/examples/bpy.types.AddonPreferences.1.py
+++ b/doc/python_api/examples/bpy.types.AddonPreferences.1.py
@@ -50,8 +50,8 @@ class OBJECT_OT_addon_prefs_example(Operator):
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
- user_preferences = context.user_preferences
- addon_prefs = user_preferences.addons[__name__].preferences
+ preferences = context.preferences
+ addon_prefs = preferences.addons[__name__].preferences
info = ("Path: %s, Number: %d, Boolean %r" %
(addon_prefs.filepath, addon_prefs.number, addon_prefs.boolean))
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index eda0ab637fa..6200a88d2b1 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -359,7 +359,7 @@ INFO_DOCS = (
# only support for properties atm.
RNA_BLACKLIST = {
# XXX messes up PDF!, really a bug but for now just workaround.
- "UserPreferencesSystem": {"language", }
+ "PreferencesSystem": {"language", }
}
MODULE_GROUPING = {
diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py
index 28b92edf489..7829e090c98 100644
--- a/intern/cycles/blender/addon/engine.py
+++ b/intern/cycles/blender/addon/engine.py
@@ -138,7 +138,7 @@ def create(engine, data, region=None, v3d=None, rv3d=None, preview_osl=False):
import bpy
data = data.as_pointer()
- userpref = bpy.context.user_preferences.as_pointer()
+ prefs = bpy.context.preferences.as_pointer()
if region:
region = region.as_pointer()
if v3d:
@@ -147,7 +147,7 @@ def create(engine, data, region=None, v3d=None, rv3d=None, preview_osl=False):
rv3d = rv3d.as_pointer()
engine.session = _cycles.create(
- engine.as_pointer(), userpref, data, region, v3d, rv3d, preview_osl)
+ engine.as_pointer(), prefs, data, region, v3d, rv3d, preview_osl)
def free(engine):
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 8e57d3a0c2f..f5e7e98b40e 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -65,7 +65,7 @@ class CyclesNodeButtonsPanel:
def get_device_type(context):
- return context.user_preferences.addons[__package__].preferences.compute_device_type
+ return context.preferences.addons[__package__].preferences.compute_device_type
def use_cpu(context):
@@ -102,7 +102,7 @@ def show_device_active(context):
cscene = context.scene.cycles
if cscene.device != 'GPU':
return True
- return context.user_preferences.addons[__package__].preferences.has_active_device()
+ return context.preferences.addons[__package__].preferences.has_active_device()
def draw_samples_info(layout, context):
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 0564f2a7456..c61972da6e6 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -281,9 +281,9 @@ def ambient_occlusion_nodes_relink():
@persistent
def do_versions(self):
- if bpy.context.user_preferences.version <= (2, 78, 1):
- prop = bpy.context.user_preferences.addons[__package__].preferences
- system = bpy.context.user_preferences.system
+ if bpy.context.preferences.version <= (2, 78, 1):
+ prop = bpy.context.preferences.addons[__package__].preferences
+ system = bpy.context.preferences.system
if not prop.is_property_set("compute_device_type"):
# Device might not currently be available so this can fail
try:
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index 768c1c589b6..69f2f9b853f 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -218,8 +218,8 @@ static PyObject *create_func(PyObject * /*self*/, PyObject *args)
BL::RenderEngine engine(engineptr);
PointerRNA userprefptr;
- RNA_pointer_create(NULL, &RNA_UserPreferences, (void*)PyLong_AsVoidPtr(pyuserpref), &userprefptr);
- BL::UserPreferences userpref(userprefptr);
+ RNA_pointer_create(NULL, &RNA_Preferences, (void*)PyLong_AsVoidPtr(pyuserpref), &userprefptr);
+ BL::Preferences userpref(userprefptr);
PointerRNA dataptr;
RNA_main_pointer_create((Main*)PyLong_AsVoidPtr(pydata), &dataptr);
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index d031d12b507..58d3b57a67e 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -53,7 +53,7 @@ int BlenderSession::end_resumable_chunk = 0;
bool BlenderSession::print_render_stats = false;
BlenderSession::BlenderSession(BL::RenderEngine& b_engine,
- BL::UserPreferences& b_userpref,
+ BL::Preferences& b_userpref,
BL::BlendData& b_data,
bool preview_osl)
: session(NULL),
@@ -79,7 +79,7 @@ BlenderSession::BlenderSession(BL::RenderEngine& b_engine,
}
BlenderSession::BlenderSession(BL::RenderEngine& b_engine,
- BL::UserPreferences& b_userpref,
+ BL::Preferences& b_userpref,
BL::BlendData& b_data,
BL::SpaceView3D& b_v3d,
BL::RegionView3D& b_rv3d,
diff --git a/intern/cycles/blender/blender_session.h b/intern/cycles/blender/blender_session.h
index fdeba7b2f81..96ffc06a3db 100644
--- a/intern/cycles/blender/blender_session.h
+++ b/intern/cycles/blender/blender_session.h
@@ -35,12 +35,12 @@ class RenderTile;
class BlenderSession {
public:
BlenderSession(BL::RenderEngine& b_engine,
- BL::UserPreferences& b_userpref,
+ BL::Preferences& b_userpref,
BL::BlendData& b_data,
bool preview_osl);
BlenderSession(BL::RenderEngine& b_engine,
- BL::UserPreferences& b_userpref,
+ BL::Preferences& b_userpref,
BL::BlendData& b_data,
BL::SpaceView3D& b_v3d,
BL::RegionView3D& b_rv3d,
@@ -102,7 +102,7 @@ public:
double last_redraw_time;
BL::RenderEngine b_engine;
- BL::UserPreferences b_userpref;
+ BL::Preferences b_userpref;
BL::BlendData b_data;
BL::RenderSettings b_render;
BL::Depsgraph b_depsgraph;
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index 7ac44a3ec9e..38e0e66b91b 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -702,7 +702,7 @@ bool BlenderSync::get_session_pause(BL::Scene& b_scene, bool background)
}
SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
- BL::UserPreferences& b_userpref,
+ BL::Preferences& b_userpref,
BL::Scene& b_scene,
bool background)
{
@@ -742,7 +742,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine& b_engine,
else if(get_enum(cscene, "device") == 1) {
PointerRNA b_preferences;
- BL::UserPreferences::addons_iterator b_addon_iter;
+ BL::Preferences::addons_iterator b_addon_iter;
for(b_userpref.addons.begin(b_addon_iter); b_addon_iter != b_userpref.addons.end(); ++b_addon_iter) {
if(b_addon_iter->module() == "cycles") {
b_preferences = b_addon_iter->preferences().ptr;
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h
index ddc5e00cf9d..8af0de39a47 100644
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@ -83,7 +83,7 @@ public:
static SceneParams get_scene_params(BL::Scene& b_scene,
bool background);
static SessionParams get_session_params(BL::RenderEngine& b_engine,
- BL::UserPreferences& b_userpref,
+ BL::Preferences& b_userpref,
BL::Scene& b_scene,
bool background);
static bool get_session_pause(BL::Scene& b_scene, bool background);
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/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list