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/addon | |
| parent | 9dde3e42a7c5bc5f7896fd30e2b3a5859d6857bf (diff) | |
RNA: naming, user-preferences -> preferences
Diffstat (limited to 'intern/cycles/blender/addon')
| -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 |
3 files changed, 7 insertions, 7 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: |