Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2016-11-19 03:15:08 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2016-11-20 17:45:22 +0300
commitf68ef05a56b7b3dca4825513b257441739c373b9 (patch)
treea89fb2c66a3f5bf779787d13d9ceed97492f5274 /release
parentaea4ed00d5a7fe661f12fbe1a16ad6574d9be8ea (diff)
Cycles: add basic backwards compatibility for device selection, move to System tab.
For the multi-GPU case users still have to reconfigure the devices they want to use. Based on patch from Lukas Stockner. Differential Revision: https://developer.blender.org/D2347
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_userpref.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index ab3ec3559e5..bdbb6330232 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -429,6 +429,9 @@ class USERPREF_PT_system(Panel):
col.separator()
+ if userpref.addons.find('cycles') != -1:
+ userpref.addons['cycles'].preferences.draw_impl(col, context)
+
if hasattr(system, "opensubdiv_compute_type"):
col.label(text="OpenSubdiv compute:")
col.row().prop(system, "opensubdiv_compute_type", text="")