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>2019-10-31 17:57:55 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-10-31 17:57:55 +0300
commiteb95e2863549d726806aa9cb9dd20a17069d910c (patch)
treef9837d5f55d2e110c29a5202ca28615a575716f2
parent4f3913db9fbbc74ac1b04a2141598feaa7a58fa3 (diff)
parent8c6c46469c906bfc6228d783da12a2abc2e7655e (diff)
Merge branch 'blender-v2.81-release'
-rw-r--r--intern/cycles/blender/addon/properties.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 840ab557132..26e1a6a223a 100644
--- 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