bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix a crash when getting the value of an enum.

Browse Source
This commit is contained in:
Campbell Barton 2011-05-18 09:26:07 +00:00
parent ebe47add08
commit 0454c817ef
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1107,21 +1107,26 @@ int RNA_property_enum_value(bContext *C, PointerRNA *ptr, PropertyRNA *prop, con
{
EnumPropertyItem *item, *item_array;
int free, found;
RNA_property_enum_items(C, ptr, prop, &item_array, NULL, &free);
for(item= item_array; item->identifier; item++) {
if(item->identifier[0] && strcmp(item->identifier, identifier)==0) {
*value = item->value;
break;
if(item_array) {
for(item= item_array; item->identifier; item++) {
if(item->identifier[0] && strcmp(item->identifier, identifier)==0) {
*value = item->value;
break;
}
}
found= (item->identifier != NULL); /* could be alloc'd, assign before free */
if(free) {
MEM_freeN(item_array);
}
}
found= (item->identifier != NULL); /* could be alloc'd, assign before free */
if(free)
MEM_freeN(item_array);
else {
found= 0;
}
return found;
}