diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-09 16:42:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-09 16:42:19 +0400 |
| commit | 1e30f000308debebf7cd5bbf6a9b37b8a94182de (patch) | |
| tree | d6edeb35644fd1048d4b71d1f55ef1ab019bacef /source/blender/makesrna/RNA_enum_types.h | |
| parent | 8a20433f0fef5ab2d881d010cd5bd19fe484e555 (diff) | |
| parent | 80f6671dfe64ece1e692c8032e1d1169621bceff (diff) | |
Merged changes in the trunk up to revision 28685.
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index fd96d1d41d7..bb0a1ba2c52 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -75,12 +75,8 @@ extern EnumPropertyItem object_type_items[]; extern EnumPropertyItem object_type_curve_items[]; -extern EnumPropertyItem sensor_type_items[]; - extern EnumPropertyItem controller_type_items[]; -extern EnumPropertyItem actuator_type_items[]; - extern EnumPropertyItem space_type_items[]; extern EnumPropertyItem keymap_propvalue_items[]; @@ -97,6 +93,8 @@ extern EnumPropertyItem viewport_shading_items[]; struct bContext; struct PointerRNA; EnumPropertyItem *rna_TransformOrientation_itemf(struct bContext *C, struct PointerRNA *ptr, int *free); +EnumPropertyItem *rna_Sensor_type_itemf(struct bContext *C, struct PointerRNA *ptr, int *free); +EnumPropertyItem *rna_Actuator_type_itemf(struct bContext *C, struct PointerRNA *ptr, int *free); /* Generic functions, return an enum from library data, index is the position * in the linked list can add more for different types as needed */ |