[Bf-blender-cvs] [ff6c6f18c15] master: Cleanup: id-property creation
Campbell Barton
noreply at git.blender.org
Mon Jul 30 08:39:15 CEST 2018
Commit: ff6c6f18c1591a213d6dffb266b9f2136ef09c3b
Author: Campbell Barton
Date: Mon Jul 30 16:36:07 2018 +1000
Branches: master
https://developer.blender.org/rBff6c6f18c1591a213d6dffb266b9f2136ef09c3b
Cleanup: id-property creation
D3473 by @JacquesLucke
===================================================================
M source/blender/python/generic/idprop_py_api.c
===================================================================
diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c
index 4b56d4412e6..4d4d5232800 100644
--- a/source/blender/python/generic/idprop_py_api.c
+++ b/source/blender/python/generic/idprop_py_api.c
@@ -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);
More information about the Bf-blender-cvs
mailing list