bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Sergey Sharybin 2024-07-02 16:03:21 +02:00
commit 368143c4f2
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
intern/cycles/blender/addon/properties.py
View File

@ -1648,14 +1648,18 @@ class CyclesPreferences(bpy.types.AddonPreferences):
def get_num_gpu_devices(self): def get_num_gpu_devices(self):
import _cycles import _cycles
compute_device_type = self.get_compute_device_type() compute_device_type = self.get_compute_device_type()
device_list = _cycles.available_devices(compute_device_type)
num = 0 num = 0
for device in device_list: if compute_device_type != 'NONE':
if device[1] != compute_device_type: device_list = _cycles.available_devices(compute_device_type)
continue # Device list might be out of sync if the user hasn't opened preference yet
for dev in self.devices: self.update_device_entries(device_list)
if dev.use and dev.id == device[2]: for device in device_list:
num += 1 if device[1] != compute_device_type:
continue
for dev in self.devices:
if dev.use and dev.id == device[2]:
num += 1
return num return num
def has_multi_device(self): def has_multi_device(self):
@ -1680,7 +1684,10 @@ class CyclesPreferences(bpy.types.AddonPreferences):
# We need non-CPU devices, used for rendering and supporting OIDN GPU denoising # We need non-CPU devices, used for rendering and supporting OIDN GPU denoising
if compute_device_type != 'NONE': if compute_device_type != 'NONE':
for device in _cycles.available_devices(compute_device_type): device_list = _cycles.available_devices(compute_device_type)
# Device list might be out of sync if the user hasn't opened preference yet
self.update_device_entries(device_list)
for device in device_list:
device_type = device[1] device_type = device[1]
if device_type == 'CPU': if device_type == 'CPU':
continue continue