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

svn merge ^/trunk/blender -r55700:55776

Browse Source
This commit is contained in:
Campbell Barton
2013-04-04 13:37:07 +00:00
parent 69035e183b 19dd08a482
commit 83fff218cc
228 changed files with 4292 additions and 2194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1778,8 +1778,10 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
if (flag & PROP_THICK_WRAP) {
if (value == Py_None)
memset(data, 0, sizeof(PointerRNA));
else
else if (RNA_struct_is_a(param->ptr.type, ptr_type))
*((PointerRNA *)data) = param->ptr;
else
raise_error = true;
}
else {
/* for function calls, we sometimes want to pass the 'ptr' directly,
@@ -1787,8 +1789,10 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
BLI_assert(value_new == NULL);
if (value == Py_None)
*((void **)data) = NULL;
else
else if (RNA_struct_is_a(param->ptr.type, ptr_type))
*((PointerRNA **)data) = &param->ptr;
else
raise_error = true;
}
}
else if (value == Py_None) {