blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

PyRNA: Ensure changed types creates a new instance 

Changing lamp type for eg needs to create a new instance.
This commit is contained in:
Campbell Barton 2017-08-01 17:11:09 +10:00
parent a108d81af9
commit 5ac9e587d4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/python/intern/bpy_rna.c
View File

@ -6663,8 +6663,20 @@ PyObject *pyrna_struct_CreatePyObject(PointerRNA *ptr)
void **instance = ptr->data ? RNA_struct_instance(ptr) : NULL;
if (instance && *instance) {
pyrna = *instance;
Py_INCREF(pyrna);
return (PyObject *)pyrna;
/* Refine may have changed types after the first instance was created. */
if (ptr->type == pyrna->ptr.type) {
Py_INCREF(pyrna);
return (PyObject *)pyrna;
}
else {
/* Existing users will need to use 'type_recast' method. */
Py_DECREF(pyrna);
/* Continue as if no instance was made */
#if 0 /* no need to assign, will be written to next... */
*instance = pyrna = NULL;
#endif
}
}
{