[Bf-blender-cvs] [ab6f60a] master: Python API: when OCIO is disabled use the same version format.

Campbell Barton noreply at git.blender.org
Mon Dec 9 15:15:01 CET 2013


Commit: ab6f60aad2b030df476a55e6c227f78e8a1b9ce8
Author: Campbell Barton
Date:   Tue Dec 10 01:11:02 2013 +1100
http://developer.blender.org/rBab6f60aad2b030df476a55e6c227f78e8a1b9ce8

Python API: when OCIO is disabled use the same version format.

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

M	source/blender/python/intern/bpy_app_ocio.c

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

diff --git a/source/blender/python/intern/bpy_app_ocio.c b/source/blender/python/intern/bpy_app_ocio.c
index dfcbfe9..eff52bc 100644
--- a/source/blender/python/intern/bpy_app_ocio.c
+++ b/source/blender/python/intern/bpy_app_ocio.c
@@ -63,8 +63,11 @@ static PyObject *make_ocio_info(void)
 		return NULL;
 	}
 
+#ifndef WITH_OCIO
 #define SetStrItem(str) \
 	PyStructSequence_SET_ITEM(ocio_info, pos++, PyUnicode_FromString(str))
+#endif
+
 #define SetObjItem(obj) \
 	PyStructSequence_SET_ITEM(ocio_info, pos++, obj)
 
@@ -77,7 +80,7 @@ static PyObject *make_ocio_info(void)
 	                                curversion >> 24, (curversion >> 16) % 256, (curversion >> 8) % 256));
 #else
 	SetObjItem(PyBool_FromLong(0));
-	SetStrItem("Unknown");
+	SetObjItem(Py_BuildValue("(iii)", 0, 0, 0));
 	SetStrItem("Unknown");
 #endif




More information about the Bf-blender-cvs mailing list