Merge branch 'blender-v2.81-release'

2019-10-31 15:57:55 +01:00 · 2019-10-31 15:57:55 +01:00 · eb95e28635
parent 4f3913db9f 8c6c46469c
commit eb95e28635
1 changed files with 3 additions and 1 deletions
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@ -1467,9 +1467,11 @@ class CyclesPreferences(bpy.types.AddonPreferences):
            devices.extend(cpu_devices)
        return devices

-    # For backwards compatibility, only has CUDA and OpenCL.
+    # For backwards compatibility, only returns CUDA and OpenCL but still
+    # refreshes all devices.
    def get_devices(self, compute_device_type=''):
        cuda_devices = self.get_devices_for_type('CUDA')
+        self.get_devices_for_type('OPTIX')
        opencl_devices = self.get_devices_for_type('OPENCL')
        return cuda_devices, opencl_devices