forked from bartvdbraak/blender
fix for compile issue on MSVC 2008 due to macro expansion differences with gcc.
This commit is contained in:
parent
771390793f
commit
d78220549b
@ -84,6 +84,9 @@ static PyStructSequence_Desc app_info_desc= {
|
||||
(sizeof(app_info_fields)/sizeof(PyStructSequence_Field)) - 1
|
||||
};
|
||||
|
||||
#define DO_EXPAND(VAL) VAL ## 1
|
||||
#define EXPAND(VAL) DO_EXPAND(VAL)
|
||||
|
||||
static PyObject *make_app_info(void)
|
||||
{
|
||||
extern char bprogname[]; /* argv[0] from creator.c */
|
||||
@ -105,7 +108,11 @@ static PyObject *make_app_info(void)
|
||||
|
||||
SetObjItem(Py_BuildValue("(iii)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION));
|
||||
SetObjItem(PyUnicode_FromFormat("%d.%02d (sub %d)", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION));
|
||||
#if defined(BLENDER_VERSION_CHAR) && EXPAND(BLENDER_VERSION_CHAR) != 1
|
||||
SetStrItem(STRINGIFY(BLENDER_VERSION_CHAR));
|
||||
#else
|
||||
SetStrItem("");
|
||||
#endif
|
||||
SetStrItem(STRINGIFY(BLENDER_VERSION_CYCLE));
|
||||
SetStrItem(bprogname);
|
||||
SetObjItem(PyBool_FromLong(G.background));
|
||||
|
Loading…
Reference in New Issue
Block a user