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

Fix logic for calling PyObject_GC_UnTrack

Browse Source 
All tracked objects need a matching un-track,
also remove redundant Py_XDECREF call.
This commit is contained in:
Campbell Barton
2021-03-04 15:06:15 +11:00
parent 0d28e2a334
commit a40ccde405
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/gpu/gpu_py_batch.c
View File

@@ -279,8 +279,8 @@ static void pygpu_batch__tp_dealloc(BPyGPUBatch *self)
GPU_batch_discard(self->batch); GPU_batch_discard(self->batch);
#ifdef USE_GPU_PY_REFERENCES #ifdef USE_GPU_PY_REFERENCES
PyObject_GC_UnTrack(self);
if (self->references) { if (self->references) {
PyObject_GC_UnTrack(self);
pygpu_batch__tp_clear(self); pygpu_batch__tp_clear(self);
Py_XDECREF(self->references); Py_XDECREF(self->references);
} }

3
source/blender/python/gpu/gpu_py_buffer.c
View File

@@ -202,8 +202,7 @@ static void pygpu_buffer__tp_dealloc(BPyGPUBuffer *self)
{ {
if (self->parent) { if (self->parent) {
PyObject_GC_UnTrack(self); PyObject_GC_UnTrack(self);
pygpu_buffer__tp_clear(self); Py_CLEAR(self->parent);
Py_XDECREF(self->parent);
} }
else { else {
MEM_freeN(self->buf.as_void); MEM_freeN(self->buf.as_void);

6
source/blender/python/intern/bpy_props.c
View File

@@ -203,10 +203,8 @@ static const EnumPropertyItem property_subtype_array_items[] = {
static void bpy_prop_deferred_dealloc(BPy_PropDeferred *self) static void bpy_prop_deferred_dealloc(BPy_PropDeferred *self)
{ {
if (self->kw) { PyObject_GC_UnTrack(self);
PyObject_GC_UnTrack(self); Py_CLEAR(self->kw);
Py_CLEAR(self->kw);
}
PyObject_GC_Del(self); PyObject_GC_Del(self);
} }