diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-15 20:31:48 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-15 20:31:48 +0300 |
| commit | bc8bd87dfffe44cd5b9053800f086704ff880f6a (patch) | |
| tree | d7ddf4bab0c5a953a6d0d4672f3d1d4c64c38a35 /intern/cycles/blender | |
| parent | 5051e580e4028e0a741e6519e469321a7e1f2a71 (diff) | |
| parent | 65d95879f73951861a90efe1c3ac5d1d03530fd6 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/blender')
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 7 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/version_update.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index c6777bb32bf..ae07bcd38fe 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1453,10 +1453,11 @@ class CyclesPreferences(bpy.types.AddonPreferences): # Update name in case it changed entry.name = device[0] - def get_devices(self): + # Gets all devices types by default. + def get_devices(self, compute_device_type=''): import _cycles # Layout of the device tuples: (Name, Type, Persistent ID) - device_list = _cycles.available_devices(self.compute_device_type) + device_list = _cycles.available_devices(compute_device_type) # Make sure device entries are up to date and not referenced before # we know we don't add new devices. This way we guarantee to not # hold pointers to a resized array. @@ -1513,7 +1514,7 @@ class CyclesPreferences(bpy.types.AddonPreferences): row = layout.row() row.prop(self, "compute_device_type", expand=True) - cuda_devices, opencl_devices = self.get_devices() + cuda_devices, opencl_devices = self.get_devices(self.compute_device_type) row = layout.row() if self.compute_device_type == 'CUDA': self._draw_devices(row, 'CUDA', cuda_devices) diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py index 76731e1f05a..664a6a913ba 100644 --- a/intern/cycles/blender/addon/version_update.py +++ b/intern/cycles/blender/addon/version_update.py @@ -253,7 +253,7 @@ def do_versions(self): pass # Init device list for UI - prop.get_devices() + prop.get_devices(prop.compute_device_type) # We don't modify startup file because it assumes to # have all the default values only. |