diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-04-03 16:46:33 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-04-03 16:46:33 +0400 |
| commit | 09c7d5aeb84443feabb5d8e03bf268cfe7a34acc (patch) | |
| tree | 7c7f881ff2e2c0e065f25bb4b1b650f273f22da4 /source/blender/makesrna/RNA_enum_types.h | |
| parent | 040f0a1096823926ab255fbb86b88363387b3148 (diff) | |
| parent | 5932cec2c6fa39a755f684b1e6de6a8a39072de6 (diff) | |
Merged changes in the trunk up to revision 35972.
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index abba8a36211..0126c62ccea 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -74,8 +74,8 @@ extern EnumPropertyItem event_type_items[]; extern EnumPropertyItem operator_return_items[]; extern EnumPropertyItem brush_sculpt_tool_items[]; -extern EnumPropertyItem brush_vertexpaint_tool_items[]; -extern EnumPropertyItem brush_imagepaint_tool_items[]; +extern EnumPropertyItem brush_vertex_tool_items[]; +extern EnumPropertyItem brush_image_tool_items[]; extern EnumPropertyItem texture_type_items[]; @@ -95,6 +95,8 @@ extern EnumPropertyItem operator_context_items[]; extern EnumPropertyItem wm_report_items[]; +extern EnumPropertyItem transform_mode_types[]; + extern EnumPropertyItem property_type_items[]; extern EnumPropertyItem property_unit_items[]; |