diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-29 04:59:04 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-29 04:59:04 +0400 |
commit | 2585d524057da908668bb6d5ff7ec8b344d23093 (patch) | |
tree | 2494aaa2281e568e4904fbe419f6a032535c65ad /source/blender/makesrna/RNA_enum_types.h | |
parent | d8e12e8710f7c24e046c132e84eff416b8e8d06c (diff) | |
parent | 4465d2f419a8515df41a8fc415774eedaef0e6f6 (diff) |
Merged changes in the trunk up to revision 46045.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
-rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index 04c6f2fa71e..cb567ac5873 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -134,7 +134,7 @@ EnumPropertyItem *rna_Actuator_type_itemf(struct bContext *C, struct PointerRNA /* Generic functions, return an enum from library data, index is the position * in the linked list can add more for different types as needed */ EnumPropertyItem *RNA_action_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); -EnumPropertyItem *RNA_action_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); +// EnumPropertyItem *RNA_action_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); EnumPropertyItem *RNA_group_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); EnumPropertyItem *RNA_group_local_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); EnumPropertyItem *RNA_image_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); |