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

PyAPI: Temp workaround for crash removing cursor

Browse Source 
Opening a new file frees the cursors,
add check if the cursor is still valid.

This leaks a Python reference, so a better solution is needed.
This commit is contained in:
Campbell Barton
2018-10-26 08:49:10 +11:00
parent 1d8ba9d618
commit 35991d9990
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/python/intern/bpy_rna_callback.c
View File

@@ -33,6 +33,7 @@
#include "RNA_types.h" #include "RNA_types.h"
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "bpy_rna.h" #include "bpy_rna.h"
#include "bpy_rna_callback.h" #include "bpy_rna_callback.h"
@@ -387,12 +388,18 @@ PyObject *pyrna_callback_classmethod_remove(PyObject *UNUSED(self), PyObject *ar
} }
bContext *C = BPy_GetContext(); bContext *C = BPy_GetContext();
struct wmWindowManager *wm = CTX_wm_manager(C); struct wmWindowManager *wm = CTX_wm_manager(C);
customdata = WM_paint_cursor_customdata_get(handle);
if (!WM_paint_cursor_end(wm, handle)) { if (BLI_findindex(&wm->paintcursors, handle) == -1) {
PyErr_SetString(PyExc_ValueError, "draw_cursor_remove(handler): cursor wasn't found"); /* FIXME(campbell): window manager has freed cursor, need to resolve refcount leak. */
return NULL; }
else {
customdata = WM_paint_cursor_customdata_get(handle);
if (!WM_paint_cursor_end(wm, handle)) {
PyErr_SetString(PyExc_ValueError, "draw_cursor_remove(handler): cursor wasn't found");
return NULL;
}
Py_DECREF((PyObject *)customdata);
} }
Py_DECREF((PyObject *)customdata);
} }
else if (RNA_struct_is_a(srna, &RNA_Space)) { else if (RNA_struct_is_a(srna, &RNA_Space)) {
const char *error_prefix = "Space.draw_handler_remove"; const char *error_prefix = "Space.draw_handler_remove";