diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-01-04 11:08:43 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-04 11:10:01 +0400 |
commit | 6734936c13b379e299bfb45915a99b605ae450c6 (patch) | |
tree | 7537aaa1fed7f722f6ae01078d88bf109f84f4c4 /source/blender/makesrna/intern/rna_userdef.c | |
parent | b9114cb609698bdd40175b79c017b8ec8d10b518 (diff) |
RNA API: use bool's for enum itemf callbacks.
Diffstat (limited to 'source/blender/makesrna/intern/rna_userdef.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 8b42fc718d1..64a0c7d7b0e 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -410,7 +410,7 @@ static PointerRNA rna_Theme_space_list_generic_get(PointerRNA *ptr) #ifdef WITH_CYCLES static EnumPropertyItem *rna_userdef_compute_device_type_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), int *free) + PropertyRNA *UNUSED(prop), bool *r_free) { EnumPropertyItem *item = NULL; int totitem = 0; @@ -423,7 +423,7 @@ static EnumPropertyItem *rna_userdef_compute_device_type_itemf(bContext *UNUSED( RNA_enum_items_add_value(&item, &totitem, compute_device_type_items, USER_COMPUTE_DEVICE_OPENCL); RNA_enum_item_end(&item, &totitem); - *free = 1; + *r_free = true; return item; } @@ -437,7 +437,7 @@ static int rna_userdef_compute_device_get(PointerRNA *UNUSED(ptr)) } static EnumPropertyItem *rna_userdef_compute_device_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), int *free) + PropertyRNA *UNUSED(prop), bool *r_free) { EnumPropertyItem tmp = {0, "", 0, "", ""}; EnumPropertyItem *item = NULL; @@ -474,14 +474,14 @@ static EnumPropertyItem *rna_userdef_compute_device_itemf(bContext *UNUSED(C), P } RNA_enum_item_end(&item, &totitem); - *free = 1; + *r_free = true; return item; } #endif static EnumPropertyItem *rna_userdef_audio_device_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), int *free) + PropertyRNA *UNUSED(prop), bool *r_free) { #ifdef WITH_JACK int jack_supported = sound_is_jack_supported(); @@ -506,21 +506,20 @@ static EnumPropertyItem *rna_userdef_audio_device_itemf(bContext *UNUSED(C), Poi #endif RNA_enum_item_end(&item, &totitem); - *free = 1; + *r_free = true; return item; } #else - (void)free; + (void)r_free; return audio_device_items; #endif } #ifdef WITH_INTERNATIONAL static EnumPropertyItem *rna_lang_enum_properties_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), int *free) + PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) { - *free = 0; /* These items are handled by BLF code! */ return BLF_RNA_lang_enum_properties(); } #endif |