[Bf-blender-cvs] [7a8a8241b93] master: Revert "t"
Germano Cavalcante
noreply at git.blender.org
Wed Feb 24 20:23:28 CET 2021
Commit: 7a8a8241b930826a43ca2ddb37c531ba73b5317e
Author: Germano Cavalcante
Date: Wed Feb 24 16:23:18 2021 -0300
Branches: master
https://developer.blender.org/rB7a8a8241b930826a43ca2ddb37c531ba73b5317e
Revert "t"
This reverts commit d3a96e5022e121426c8926d0507effe4e9b4005f.
===================================================================
M source/blender/python/intern/bpy_rna_callback.c
===================================================================
diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c
index 34c1b8e84d6..7f8ea54ab98 100644
--- a/source/blender/python/intern/bpy_rna_callback.c
+++ b/source/blender/python/intern/bpy_rna_callback.c
@@ -24,7 +24,6 @@
#include <Python.h>
#include "../generic/python_utildefines.h"
-#include "../generic/py_capi_utils.h"
#include "DNA_space_types.h"
@@ -496,40 +495,28 @@ PyObject *pyrna_callback_classmethod_remove(PyObject *UNUSED(self), PyObject *ar
static void cb_customdata_free(void *customdata)
{
PyObject *tuple = customdata;
-
- Py_DECREF(tuple);
-}
-
-void BPY_callback_screen_free(struct ARegionType *art)
-{
- bool use_gil = !PyC_IsInterpreterActive();
+ bool use_gil = true; /* !PyC_IsInterpreterActive(); */
PyGILState_STATE gilstate;
if (use_gil) {
gilstate = PyGILState_Ensure();
}
- ED_region_draw_cb_remove_by_type(art, cb_region_draw, cb_customdata_free);
+
+ Py_DECREF(tuple);
if (use_gil) {
PyGILState_Release(gilstate);
}
}
-void BPY_callback_wm_free(struct wmWindowManager *wm)
+void BPY_callback_screen_free(struct ARegionType *art)
{
- bool use_gil = !PyC_IsInterpreterActive();
-
- PyGILState_STATE gilstate;
- if (use_gil) {
- gilstate = PyGILState_Ensure();
- }
+ ED_region_draw_cb_remove_by_type(art, cb_region_draw, cb_customdata_free);
+}
- BLI_assert(PyC_IsInterpreterActive());
+void BPY_callback_wm_free(struct wmWindowManager *wm)
+{
WM_paint_cursor_remove_by_type(wm, cb_wm_cursor_draw, cb_customdata_free);
-
- if (use_gil) {
- PyGILState_Release(gilstate);
- }
}
/** \} */
More information about the Bf-blender-cvs
mailing list