sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

exclude self references from the ID search list when PROP_ID_SELF_CHECK is set, also raise an error from python if this is attempted

Browse Source
This commit is contained in:
Campbell Barton 2010-02-22 08:27:45 +00:00
parent 2bfee787a6
commit e31d0198e6
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/interface_templates.c
View File

@ -157,11 +157,13 @@ static void id_search_cb(const bContext *C, void *arg_template, char *str, uiSea
{
TemplateID *template= (TemplateID*)arg_template;
ListBase *lb= template->idlb;
ID *id;
ID *id, *id_from= template->ptr.id.data;
int iconid;
int flag= RNA_property_flag(template->prop);
/* ID listbase */
for(id= lb->first; id; id= id->next) {
if(!((flag & PROP_ID_SELF_CHECK) && id == id_from)) {
if(BLI_strcasestr(id->name+2, str)) {
iconid= ui_id_icon_get((bContext*)C, id, 0);
@ -169,6 +171,7 @@ static void id_search_cb(const bContext *C, void *arg_template, char *str, uiSea
break;
}
}
}
}
/* ID Search browse menu, open */

6
source/blender/makesrna/intern/rna_access.c
View File

@ -1937,9 +1937,13 @@ void RNA_property_pointer_set(PointerRNA *ptr, PropertyRNA *prop, PointerRNA ptr
else {
PointerPropertyRNA *pprop= (PointerPropertyRNA*)prop;
if(pprop->set && !((prop->flag & PROP_NEVER_NULL) && ptr_value.data == NULL))
if( pprop->set &&
!((prop->flag & PROP_NEVER_NULL) && ptr_value.data == NULL) &&
!((prop->flag & PROP_ID_SELF_CHECK) && ptr->id.data == ptr_value.id.data)
) {
pprop->set(ptr, ptr_value);
}
}
}
void RNA_property_pointer_add(PointerRNA *ptr, PropertyRNA *prop)

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

@ -886,6 +886,9 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, ParameterList *parms, v
} else if((flag & PROP_NEVER_NULL) && value == Py_None) {
PyErr_Format(PyExc_TypeError, "%.200s does not support a 'None' assignment %.200s type", error_prefix, RNA_struct_identifier(ptype));
return -1;
} else if(value != Py_None && ((flag & PROP_ID_SELF_CHECK) && ptr->id.data == ((BPy_StructRNA*)value)->ptr.id.data)) {
PyErr_Format(PyExc_TypeError, "%.200s ID type does not support assignment to its self", error_prefix);
return -1;
} else {
BPy_StructRNA *param= (BPy_StructRNA*)value;
int raise_error= FALSE;