diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-28 03:11:22 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-28 03:11:22 +0400 |
| commit | 040f0a1096823926ab255fbb86b88363387b3148 (patch) | |
| tree | 60993eb3d96a522c5808c7dea08170fd11fe205a /source/blender/makesrna/RNA_enum_types.h | |
| parent | 003ab20292924b829a20ec852188e0e18154f3ef (diff) | |
| parent | 2e6a02438e997f1024f3ba6c332314f09f01a3b4 (diff) | |
Merged changes in the trunk up to revision 35828.
Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
According to the changes in revision 35667, the Freestyle-related code
in release/scripts/ui/ was moved to release/scripts/startup/bl_ui/.
Diffstat (limited to 'source/blender/makesrna/RNA_enum_types.h')
| -rw-r--r-- | source/blender/makesrna/RNA_enum_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index cbf03c2c67d..abba8a36211 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -102,11 +102,12 @@ extern EnumPropertyItem viewport_shade_items[]; extern EnumPropertyItem node_socket_type_items[]; -extern EnumPropertyItem node_blend_type_items[]; extern EnumPropertyItem node_math_items[]; extern EnumPropertyItem node_vec_math_items[]; extern EnumPropertyItem node_filter_items[]; +extern EnumPropertyItem ramp_blend_items[]; + extern EnumPropertyItem linestyle_color_modifier_type_items[]; extern EnumPropertyItem linestyle_alpha_modifier_type_items[]; extern EnumPropertyItem linestyle_thickness_modifier_type_items[]; |