diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-10-18 09:09:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-18 09:09:41 +0300 |
commit | ec2bbc90e7c6a7f21da253333a14d49ef1428319 (patch) | |
tree | 0ee36fb8e39593f29197d5fae17b885cc1a700e1 /source/blender/makesrna/RNA_access.h | |
parent | 54f9a6e5da06e671f7640c9ec3ac3c305644beb6 (diff) | |
parent | ab7ebf2b10f67b002447fb0e2cb352c2c178e128 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/RNA_access.h')
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 501a1cccca6..7bb9e772697 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -846,22 +846,25 @@ void RNA_property_float_ui_range(PointerRNA *ptr, PropertyRNA *prop, float *soft int RNA_property_float_clamp(PointerRNA *ptr, PropertyRNA *prop, float *value); int RNA_property_int_clamp(PointerRNA *ptr, PropertyRNA *prop, int *value); -bool RNA_enum_identifier(EnumPropertyItem *item, const int value, const char **identifier); -int RNA_enum_bitflag_identifiers(EnumPropertyItem *item, const int value, const char **identifier); -bool RNA_enum_name(EnumPropertyItem *item, const int value, const char **r_name); -bool RNA_enum_description(EnumPropertyItem *item, const int value, const char **description); -int RNA_enum_from_value(EnumPropertyItem *item, const int value); -int RNA_enum_from_identifier(EnumPropertyItem *item, const char *identifier); +bool RNA_enum_identifier(const EnumPropertyItem *item, const int value, const char **identifier); +int RNA_enum_bitflag_identifiers(const EnumPropertyItem *item, const int value, const char **identifier); +bool RNA_enum_name(const EnumPropertyItem *item, const int value, const char **r_name); +bool RNA_enum_description(const EnumPropertyItem *item, const int value, const char **description); +int RNA_enum_from_value(const EnumPropertyItem *item, const int value); +int RNA_enum_from_identifier(const EnumPropertyItem *item, const char *identifier); void RNA_property_enum_items_ex( struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const bool use_static, - EnumPropertyItem **item, int *r_totitem, bool *r_free); -void RNA_property_enum_items(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, - EnumPropertyItem **item, int *r_totitem, bool *r_free); -void RNA_property_enum_items_gettexted(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, - EnumPropertyItem **r_item, int *r_totitem, bool *r_free); -void RNA_property_enum_items_gettexted_all(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, - EnumPropertyItem **r_item, int *r_totitem, bool *r_free); + const EnumPropertyItem **r_item, int *r_totitem, bool *r_free); +void RNA_property_enum_items( + struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, + const EnumPropertyItem **r_item, int *r_totitem, bool *r_free); +void RNA_property_enum_items_gettexted( + struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, + const EnumPropertyItem **r_item, int *r_totitem, bool *r_free); +void RNA_property_enum_items_gettexted_all( + struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, + const EnumPropertyItem **r_item, int *r_totitem, bool *r_free); bool RNA_property_enum_value(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const char *identifier, int *r_value); bool RNA_property_enum_identifier(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const int value, const char **identifier); bool RNA_property_enum_name(struct bContext *C, PointerRNA *ptr, PropertyRNA *prop, const int value, const char **name); @@ -1059,10 +1062,10 @@ void RNA_enum_set_identifier(struct bContext *C, PointerRNA *ptr, const char *na bool RNA_enum_is_equal(struct bContext *C, PointerRNA *ptr, const char *name, const char *enumname); /* lower level functions that don't use a PointerRNA */ -bool RNA_enum_value_from_id(EnumPropertyItem *item, const char *identifier, int *r_value); -bool RNA_enum_id_from_value(EnumPropertyItem *item, int value, const char **r_identifier); -bool RNA_enum_icon_from_value(EnumPropertyItem *item, int value, int *r_icon); -bool RNA_enum_name_from_value(EnumPropertyItem *item, int value, const char **r_name); +bool RNA_enum_value_from_id(const EnumPropertyItem *item, const char *identifier, int *r_value); +bool RNA_enum_id_from_value(const EnumPropertyItem *item, int value, const char **r_identifier); +bool RNA_enum_icon_from_value(const EnumPropertyItem *item, int value, int *r_icon); +bool RNA_enum_name_from_value(const EnumPropertyItem *item, int value, const char **r_name); void RNA_string_get(PointerRNA *ptr, const char *name, char *value); char *RNA_string_get_alloc(PointerRNA *ptr, const char *name, char *fixedbuf, int fixedlen); |