[Bf-blender-cvs] [2f5a027b946] blender-v2.79a-release: Cycles: Fix bug in user preferences with factory startup

[Sergey Sharybin]

Commit: 2f5a027b946a1f0179ff26aabf94df5e53ab5f70
Author: Sergey Sharybin
Date:   Tue Jan 23 16:16:09 2018 +0100
Branches: blender-v2.79a-release
https://developer.blender.org/rB2f5a027b946a1f0179ff26aabf94df5e53ab5f70

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.

===================================================================

M	intern/cycles/blender/addon/properties.py

===================================================================

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