diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
| commit | feccbaabbd39c18b2f552964ebd8dfab4eeaed89 (patch) | |
| tree | 0069f654883a7a02dd320649ce61bd7933748111 /source/blender/makesrna/RNA_enum_types.h | |
| parent | a22096e8019c461128a0907e4026859996ec1b5c (diff) | |
| parent | 37ba969c74840142682cf22f34610f3b65b86cf4 (diff) | |
Merged changes in the trunk up to revision 53584.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h
Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index 75bb3475fed..a8df3b9dfdd 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -70,6 +70,7 @@ extern EnumPropertyItem keyframe_handle_type_items[]; extern EnumPropertyItem keyblock_type_items[]; extern EnumPropertyItem keyingset_path_grouping_items[]; +extern EnumPropertyItem keying_flag_items[]; extern EnumPropertyItem keyframe_paste_offset_items[]; extern EnumPropertyItem keyframe_paste_merge_items[]; @@ -89,6 +90,8 @@ extern EnumPropertyItem brush_sculpt_tool_items[]; extern EnumPropertyItem brush_vertex_tool_items[]; extern EnumPropertyItem brush_image_tool_items[]; +extern EnumPropertyItem symmetrize_direction_items[]; + extern EnumPropertyItem texture_type_items[]; extern EnumPropertyItem lamp_type_items[]; @@ -132,6 +135,9 @@ extern EnumPropertyItem prop_dynamicpaint_type_items[]; extern EnumPropertyItem clip_editor_mode_items[]; +extern EnumPropertyItem icon_items[]; +extern EnumPropertyItem uilist_layout_type_items[]; + #ifdef WITH_FREESTYLE extern EnumPropertyItem linestyle_color_modifier_type_items[]; extern EnumPropertyItem linestyle_alpha_modifier_type_items[]; |