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/cycles/blender/blender_sync.cpp | |
| parent | 9dde3e42a7c5bc5f7896fd30e2b3a5859d6857bf (diff) | |
RNA: naming, user-preferences -> preferences
Diffstat (limited to 'intern/cycles/blender/blender_sync.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_sync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |