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

RNA & interface functions for checking if RNA in a button uses valid rna property (not currently used).

Browse Source
This commit is contained in:
Campbell Barton 2011-03-24 09:27:41 +00:00
parent 0c9488b2f3
commit b3d70cbcba
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/interface/interface.c
View File

@ -1211,6 +1211,17 @@ int ui_is_but_unit(uiBut *but)
return 1; return 1;
} }
int ui_is_but_rna_valid(uiBut *but)
{
if (but->rnaprop==NULL || RNA_struct_contains_property(&but->rnapoin, but->rnaprop)) {
return TRUE;
}
else {
printf("property removed %s: %p\n", but->drawstr, but->rnaprop);
return FALSE;
}
}
double ui_get_but_val(uiBut *but) double ui_get_but_val(uiBut *but)
{ {
PropertyRNA *prop; PropertyRNA *prop;

1
source/blender/editors/interface/interface_intern.h
View File

@ -376,6 +376,7 @@ extern void ui_set_but_soft_range(uiBut *but, double value);
extern void ui_check_but(uiBut *but); extern void ui_check_but(uiBut *but);
extern int ui_is_but_float(uiBut *but); extern int ui_is_but_float(uiBut *but);
extern int ui_is_but_unit(uiBut *but); extern int ui_is_but_unit(uiBut *but);
extern int ui_is_but_rna_valid(uiBut *but);
extern void ui_bounds_block(uiBlock *block); extern void ui_bounds_block(uiBlock *block);
extern void ui_block_translate(uiBlock *block, int x, int y); extern void ui_block_translate(uiBlock *block, int x, int y);

1
source/blender/makesrna/RNA_access.h
View File

@ -621,6 +621,7 @@ int RNA_struct_idprops_register_check(StructRNA *type);
PropertyRNA *RNA_struct_find_property(PointerRNA *ptr, const char *identifier); PropertyRNA *RNA_struct_find_property(PointerRNA *ptr, const char *identifier);
int RNA_struct_contains_property(PointerRNA *ptr, PropertyRNA *prop_test);
/* lower level functions for access to type properties */ /* lower level functions for access to type properties */
const struct ListBase *RNA_struct_type_properties(StructRNA *srna); const struct ListBase *RNA_struct_type_properties(StructRNA *srna);

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

@ -574,6 +574,28 @@ PropertyRNA *RNA_struct_find_nested(PointerRNA *ptr, StructRNA *srna)
return prop; return prop;
} }
int RNA_struct_contains_property(PointerRNA *ptr, PropertyRNA *prop_test)
{
/* note, prop_test could be freed memory, only use for comparison */
/* validate the RNA is ok */
PropertyRNA *iterprop;
int found= FALSE;
iterprop= RNA_struct_iterator_property(ptr->type);
RNA_PROP_BEGIN(ptr, itemptr, iterprop) {
/* PropertyRNA *prop= itemptr.data; */
if(prop_test == (PropertyRNA *)itemptr.data) {
found= TRUE;
break;
}
}
RNA_PROP_END;
return found;
}
/* low level direct access to type->properties, note this ignores parent classes so should be used with care */ /* low level direct access to type->properties, note this ignores parent classes so should be used with care */
const struct ListBase *RNA_struct_type_properties(StructRNA *srna) const struct ListBase *RNA_struct_type_properties(StructRNA *srna)
{ {