diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-08 15:57:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-08 15:57:53 +0400 |
| commit | 76a211d80947a453f594e4cf0a1e0acc6786eddf (patch) | |
| tree | 59d806409fe72f733bce9c43eb6823b59642c6fd /source/blender/makesrna/RNA_enum_types.h | |
| parent | f88501a44d1f519539d056a7d1f240d126a5071a (diff) | |
| parent | 3dead22c7322cf72ee63a003ba50940abc12e7c9 (diff) | |
Merged changes in the trunk up to revision 43219.
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index fb6e2544296..7daa92b1788 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -104,6 +104,8 @@ extern EnumPropertyItem property_type_items[]; extern EnumPropertyItem property_subtype_items[]; extern EnumPropertyItem property_unit_items[]; +extern EnumPropertyItem gameproperty_type_items[]; + extern EnumPropertyItem viewport_shade_items[]; extern EnumPropertyItem nodetree_type_items[]; |