blender
/
blender
128
395
Fork 568
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T49342: TypeError when autocompleting bpy.app.something. 

Regression from rB036c006cefe471. We can't use self here, self is bpy.app, not pydescriptor of python path getsetter...

So for now, do not try to replace getsetter by actual value in bpy.app's dict,
just return static var generated on first run.

Should be safe for 2.78.
This commit is contained in:
Bastien Montagne 2016-09-14 15:40:35 +02:00 committed by Sergey Sharybin
parent e02c63df1b
commit 14d26df2f1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/python/intern/bpy_app.c
View File

@ -234,7 +234,7 @@ static int bpy_app_debug_set(PyObject *UNUSED(self), PyObject *value, void *clos
return 0;
}
#define BROKEN_BINARY_PATH_PYTHON_HACK
PyDoc_STRVAR(bpy_app_binary_path_python_doc,
"String, the path to the python executable (read-only)"
@ -251,14 +251,18 @@ static PyObject *bpy_app_binary_path_python_get(PyObject *self, void *UNUSED(clo
fullpath, sizeof(fullpath),
PY_MAJOR_VERSION, PY_MINOR_VERSION);
ret = PyC_UnicodeFromByte(fullpath);
PyDict_SetItem(BlenderAppType.tp_dict, PyDescr_NAME(self), ret);
#ifdef BROKEN_BINARY_PATH_PYTHON_HACK
Py_INCREF(ret);
UNUSED_VARS(self);
#else
PyDict_SetItem(BlenderAppType.tp_dict, /* XXX BAAAADDDDDD! self is not a PyDescr at all! it's bpy.app!!! */ PyDescr_NAME(self), ret);
#endif
}
else {
Py_INCREF(ret);
}
return ret;
}
PyDoc_STRVAR(bpy_app_debug_value_doc,