diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-12-21 04:47:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-21 04:55:02 +0300 |
commit | 63fcbfc3a7325d79b9e916457d64c302ddfeadfa (patch) | |
tree | f194e16441c06af61a2c34ef6dc119ac2c98f9a3 /intern | |
parent | 9dde3e42a7c5bc5f7896fd30e2b3a5859d6857bf (diff) |
RNA: naming, user-preferences -> preferences
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/engine.py | 4 | ||||
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 4 | ||||
-rw-r--r-- | intern/cycles/blender/addon/version_update.py | 6 | ||||
-rw-r--r-- | intern/cycles/blender/blender_python.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/blender/blender_session.h | 6 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/blender/blender_sync.h | 2 |
8 files changed, 17 insertions, 17 deletions
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); |