archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: fix crash in 3d view status text display.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-08-23 12:20:11 +00:00
parent f717a1cca6
commit bd38aa51ad
3 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
intern/cycles/blender/blender_python.cpp
View File

@@ -129,37 +129,16 @@ static PyObject *draw_func(PyObject *self, PyObject *args)
BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
bool draw_text = false;
if(PyLong_AsVoidPtr(pyrv3d)) {
/* 3d view drawing */
int viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
draw_text = session->draw(viewport[2], viewport[3]);
}
else {
/* image editor drawing */
draw_text = session->draw();
session->draw(viewport[2], viewport[3]);
}
/* draw */
PyObject *ret = PyTuple_New(2);
if(!draw_text) {
PyTuple_SetItem(ret, 0, PyUnicode_FromString(""));
PyTuple_SetItem(ret, 1, PyUnicode_FromString(""));
}
else {
string status, substatus;
session->get_status(status, substatus);
PyTuple_SetItem(ret, 0, PyUnicode_FromString(status.c_str()));
PyTuple_SetItem(ret, 1, PyUnicode_FromString(substatus.c_str()));
}
return ret;
Py_INCREF(Py_None);
return Py_None;
}
static PyObject *sync_func(PyObject *self, PyObject *args)