diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-07 17:00:48 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-07 17:00:48 +0300 |
commit | 4fe578c827afacdd67f9f8064b2cd831af29e6a2 (patch) | |
tree | a7f807f661a89c440583d3edff11e13caa36cd0d /intern | |
parent | e7c3f7ba6f1385a2138862de8568e571fa97b5b4 (diff) | |
parent | 3b1f90ed84c52260ce94a26c414ad8c51f6a1365 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/blender/addon/properties.py | 4 | ||||
-rw-r--r-- | intern/cycles/device/opencl/opencl_util.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 3de11a1c701..e0b5c1446a4 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1484,7 +1484,11 @@ class CyclesPreferences(bpy.types.AddonPreferences): return self.get_num_gpu_devices() > 0 def draw_impl(self, layout, context): + available_device_types = self.get_device_types(context) layout.label(text="Cycles Compute Device:") + if len(available_device_types) == 1: + layout.label(text="No compatible GPUs found", icon='INFO') + return layout.row().prop(self, "compute_device_type", expand=True) cuda_devices, opencl_devices = self.get_devices() diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp index 4c9f3cd6ef7..f43aa5f350a 100644 --- a/intern/cycles/device/opencl/opencl_util.cpp +++ b/intern/cycles/device/opencl/opencl_util.cpp @@ -645,7 +645,7 @@ bool OpenCLInfo::device_supported(const string& platform_name, return true; } if(platform_name == "Apple" && device_type == CL_DEVICE_TYPE_GPU) { - return true; + return false; } return false; } |