[Bf-blender-cvs] [96f95e0] master: Python API: when OIIO is disabled use the same version format.
Campbell Barton
noreply at git.blender.org
Tue Dec 10 03:03:09 CET 2013
Commit: 96f95e02233d21129860c9a163bf284039c7c89f
Author: Campbell Barton
Date: Tue Dec 10 12:58:10 2013 +1100
http://developer.blender.org/rB96f95e02233d21129860c9a163bf284039c7c89f
Python API: when OIIO is disabled use the same version format.
===================================================================
M source/blender/python/intern/bpy_app_oiio.c
===================================================================
diff --git a/source/blender/python/intern/bpy_app_oiio.c b/source/blender/python/intern/bpy_app_oiio.c
index db6df92..b5f0f32 100644
--- a/source/blender/python/intern/bpy_app_oiio.c
+++ b/source/blender/python/intern/bpy_app_oiio.c
@@ -63,8 +63,11 @@ static PyObject *make_oiio_info(void)
return NULL;
}
+#ifndef WITH_OPENIMAGEIO
#define SetStrItem(str) \
PyStructSequence_SET_ITEM(oiio_info, pos++, PyUnicode_FromString(str))
+#endif
+
#define SetObjItem(obj) \
PyStructSequence_SET_ITEM(oiio_info, pos++, obj)
@@ -77,7 +80,7 @@ static PyObject *make_oiio_info(void)
curversion / 10000, (curversion / 100) % 100, curversion % 100));
#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