[Bf-blender-cvs] [4d9f357bf6b] master: Fix T81806: Cycles error when GPU device_type is NONE

[Campbell Barton]

Commit: 4d9f357bf6b5cdd54d3d0406ef9ac79b387a21b5
Author: Campbell Barton
Date:   Mon Oct 19 23:58:28 2020 +1100
Branches: master
https://developer.blender.org/rB4d9f357bf6b5cdd54d3d0406ef9ac79b387a21b5

Fix T81806: Cycles error when GPU device_type is NONE

Own regression in 4bea4702d5d5a

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

M       intern/cycles/blender/blender_python.cpp

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

diff --git a/intern/cycles/blender/blender_python.cpp 
b/intern/cycles/blender/blender_python.cpp
index 021985bd2ba..525525e1047 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -410,7 +410,8 @@ static PyObject *available_devices_func(PyObject * 
/*self*/, PyObject *args)
   }
 
   DeviceType type = Device::type_from_string(type_name);
-  if ((type == DEVICE_NONE) && (type_name[0] != '\0')) {
+  /* "NONE" is defined by the add-on, see: 
`CyclesPreferences.get_device_types`. */
+  if ((type == DEVICE_NONE) && (strcmp(type_name, "NONE") != 0)) {
     PyErr_Format(PyExc_ValueError, "Device \"%s\" not known.", type_name);
     return NULL;
   }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs