diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-23 18:16:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-01-23 18:16:09 +0300 |
| commit | 2f5a027b946a1f0179ff26aabf94df5e53ab5f70 (patch) | |
| tree | 4f806d70c207f0ed59811bc12696f2c6f7a4fab8 | |
| parent | 61335d853d113c827a54ab3b71e357fab2aa507a (diff) | |
Cycles: Fix bug in user preferences with factory startup
Namely, the issue would happen when CPU device was never used before.
Issue with wrong merge conflict resolution.
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index ec9f93671d8..db5ec73a068 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1374,7 +1374,7 @@ class CyclesPreferences(bpy.types.AddonPreferences): def update_device_entries(self, device_list): for device in device_list: - if not device[1] in {'CUDA', 'OPENCL'}: + if not device[1] in {'CUDA', 'OPENCL', 'CPU'}: continue entry = None |