Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: id-property creation

Browse Source 
D3473 by @JacquesLucke
This commit is contained in:
Campbell Barton
2018-07-30 16:36:07 +10:00
parent f4379f8b91
commit ff6c6f18c1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/python/generic/idprop_py_api.c
View File

@@ -596,15 +596,15 @@ static IDProperty *idp_from_PyMapping(const char *name, PyObject *ob)
return prop;
}
static IDProperty *idp_from_DatablockPointer(const char *name, PyObject *ob, IDPropertyTemplate *val)
static IDProperty *idp_from_DatablockPointer(const char *name, PyObject *ob)
{
pyrna_id_FromPyObject(ob, &val->id);
return IDP_New(IDP_ID, val, name);
IDPropertyTemplate val = {0};
pyrna_id_FromPyObject(ob, &val.id);
return IDP_New(IDP_ID, &val, name);
}
static IDProperty *idp_from_PyObject(PyObject *name_obj, PyObject *ob)
{
IDPropertyTemplate val = {0};
const char *name = idp_try_read_name(name_obj);
if (name == NULL) {
return NULL;
@@ -626,7 +626,7 @@ static IDProperty *idp_from_PyObject(PyObject *name_obj, PyObject *ob)
return idp_from_PySequence(name, ob);
}
else if (ob == Py_None || pyrna_id_CheckPyObject(ob)) {
return idp_from_DatablockPointer(name, ob, &val);
return idp_from_DatablockPointer(name, ob);
}
else if (PyMapping_Check(ob)) {
return idp_from_PyMapping(name, ob);