Merge branch 'blender-v4.3-release'

This commit is contained in:
Campbell Barton
2024-10-12 00:29:25 +11:00
21 changed files with 44 additions and 55 deletions

View File

@@ -1703,7 +1703,7 @@ static PyObject *BPy_IDGroup_pop(BPy_IDProperty *self, PyObject *args)
PyErr_SetString(PyExc_KeyError, "item not in group");
return nullptr;
}
return Py_INCREF_RET(def);
return Py_NewRef(def);
}
pyform = BPy_IDGroup_MapDataToPy(idprop);
@@ -1726,7 +1726,7 @@ static void BPy_IDGroup_CorrectListLen(IDProperty *prop, PyObject *seq, int len,
/* fill rest of list with valid references to None */
for (j = len; j < prop->len; j++) {
PyList_SET_ITEM(seq, j, Py_INCREF_RET(Py_None));
PyList_SET_ITEM(seq, j, Py_NewRef(Py_None));
}
/* Set correct group length. */

View File

@@ -1230,7 +1230,7 @@ void PyC_RunQuicky(const char *filepath, int n, ...)
PyErr_Print();
PyErr_Clear();
PyList_SET_ITEM(values, i, Py_INCREF_RET(Py_None)); /* hold user */
PyList_SET_ITEM(values, i, Py_NewRef(Py_None)); /* hold user */
sizes[i] = 0;
}

View File

@@ -20,16 +20,6 @@
} \
(void)0
/**
* Wrap #Py_INCREF & return the result,
* use sparingly to avoid comma operator or temp var assignment.
*/
Py_LOCAL_INLINE(PyObject *) Py_INCREF_RET(PyObject *op)
{
Py_INCREF(op);
return op;
}
/**
* Append & transfer ownership to the list,
* avoids inline #Py_DECREF all over (which is quite a large macro).