[Bf-blender-cvs] [e57fb9d] GPencil_Editing_Stage3: Merge branch 'master' into GPencil_Editing_Stage3
Joshua Leung
noreply at git.blender.org
Mon Nov 23 11:48:06 CET 2015
Commit: e57fb9dae77a6eeddfb467ea84dd7578d836842f
Author: Joshua Leung
Date: Mon Nov 23 23:15:57 2015 +1300
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rBe57fb9dae77a6eeddfb467ea84dd7578d836842f
Merge branch 'master' into GPencil_Editing_Stage3
Conflicts:
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_sculpt_paint.c
===================================================================
===================================================================
diff --cc source/blender/editors/object/object_edit.c
index 237ebef,fb4065b..b11ed3c
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -1507,10 -1506,9 +1507,10 @@@ static void UNUSED_FUNCTION(image_aspec
static EnumPropertyItem *object_mode_set_itemsf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
{
- EnumPropertyItem *input = object_mode_items;
+ EnumPropertyItem *input = rna_enum_object_mode_items;
EnumPropertyItem *item = NULL;
Object *ob;
+ bGPdata *gpd;
int totitem = 0;
if (!C) /* needed for docs */
diff --cc source/blender/makesrna/RNA_enum_types.h
index 6032e80,0066236..0576820
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@@ -41,123 -39,157 +39,159 @@@ struct bNodeSocketType
extern EnumPropertyItem DummyRNA_NULL_items[];
extern EnumPropertyItem DummyRNA_DEFAULT_items[];
- extern EnumPropertyItem object_mode_items[];
- extern EnumPropertyItem object_empty_drawtype_items[];
- extern EnumPropertyItem metaelem_type_items[];
+ /* all others should follow 'rna_enum_*_items' naming */
+ extern EnumPropertyItem rna_enum_id_type_items[];
+
+ extern EnumPropertyItem rna_enum_object_mode_items[];
+ extern EnumPropertyItem rna_enum_object_empty_drawtype_items[];
+ extern EnumPropertyItem rna_enum_metaelem_type_items[];
+
+ extern EnumPropertyItem rna_enum_proportional_falloff_items[];
+ extern EnumPropertyItem rna_enum_proportional_falloff_curve_only_items[];
+ extern EnumPropertyItem rna_enum_proportional_editing_items[];
+ extern EnumPropertyItem rna_enum_snap_target_items[];
+ extern EnumPropertyItem rna_enum_snap_element_items[];
+ extern EnumPropertyItem rna_enum_snap_node_element_items[];
+ extern EnumPropertyItem rna_enum_mesh_select_mode_items[];
+ extern EnumPropertyItem rna_enum_mesh_delimit_mode_items[];
+ extern EnumPropertyItem rna_enum_space_type_items[];
+ extern EnumPropertyItem rna_enum_region_type_items[];
+ extern EnumPropertyItem rna_enum_object_modifier_type_items[];
+ extern EnumPropertyItem rna_enum_constraint_type_items[];
+ extern EnumPropertyItem rna_enum_boidrule_type_items[];
+ extern EnumPropertyItem rna_enum_sequence_modifier_type_items[];
+
+ extern EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[];
+ extern EnumPropertyItem rna_enum_modifier_triangulate_ngon_method_items[];
+
+ extern EnumPropertyItem rna_enum_image_type_items[];
+ extern EnumPropertyItem rna_enum_image_color_mode_items[];
+ extern EnumPropertyItem rna_enum_image_color_depth_items[];
+ extern EnumPropertyItem rna_enum_image_generated_type_items[];
+
+ extern EnumPropertyItem rna_enum_normal_space_items[];
+ extern EnumPropertyItem rna_enum_normal_swizzle_items[];
+ extern EnumPropertyItem rna_enum_bake_save_mode_items[];
+
+ extern EnumPropertyItem rna_enum_views_format_items[];
+ extern EnumPropertyItem rna_enum_views_format_multilayer_items[];
+ extern EnumPropertyItem rna_enum_views_format_multiview_items[];
+ extern EnumPropertyItem rna_enum_stereo3d_display_items[];
+ extern EnumPropertyItem rna_enum_stereo3d_anaglyph_type_items[];
+ extern EnumPropertyItem rna_enum_stereo3d_interlace_type_items[];
+
+ extern EnumPropertyItem rna_enum_exr_codec_items[];
+ extern EnumPropertyItem rna_enum_color_sets_items[];
+
+ extern EnumPropertyItem rna_enum_beztriple_keyframe_type_items[];
+ extern EnumPropertyItem rna_enum_beztriple_interpolation_mode_items[];
+ extern EnumPropertyItem rna_enum_beztriple_interpolation_easing_items[];
+ extern EnumPropertyItem rna_enum_keyframe_handle_type_items[];
+
+ extern EnumPropertyItem rna_enum_keyblock_type_items[];
+
+ extern EnumPropertyItem rna_enum_keyingset_path_grouping_items[];
+ extern EnumPropertyItem rna_enum_keying_flag_items[];
- extern EnumPropertyItem proportional_falloff_items[];
- extern EnumPropertyItem proportional_falloff_curve_only_items[];
- extern EnumPropertyItem proportional_editing_items[];
- extern EnumPropertyItem snap_target_items[];
- extern EnumPropertyItem snap_element_items[];
- extern EnumPropertyItem snap_node_element_items[];
- extern EnumPropertyItem mesh_select_mode_items[];
- extern EnumPropertyItem mesh_delimit_mode_items[];
- extern EnumPropertyItem space_type_items[];
- extern EnumPropertyItem region_type_items[];
- extern EnumPropertyItem modifier_type_items[];
- extern EnumPropertyItem constraint_type_items[];
- extern EnumPropertyItem boidrule_type_items[];
- extern EnumPropertyItem sequence_modifier_type_items[];
+ extern EnumPropertyItem rna_enum_keyframe_paste_offset_items[];
+ extern EnumPropertyItem rna_enum_keyframe_paste_merge_items[];
- extern EnumPropertyItem modifier_triangulate_quad_method_items[];
- extern EnumPropertyItem modifier_triangulate_ngon_method_items[];
+ extern EnumPropertyItem rna_enum_fmodifier_type_items[];
- extern EnumPropertyItem image_type_items[];
- extern EnumPropertyItem image_color_mode_items[];
- extern EnumPropertyItem image_color_depth_items[];
- extern EnumPropertyItem image_generated_type_items[];
+ extern EnumPropertyItem rna_enum_nla_mode_extend_items[];
+ extern EnumPropertyItem rna_enum_nla_mode_blend_items[];
- extern EnumPropertyItem normal_space_items[];
- extern EnumPropertyItem normal_swizzle_items[];
- extern EnumPropertyItem bake_save_mode_items[];
+ extern EnumPropertyItem rna_enum_motionpath_bake_location_items[];
- extern EnumPropertyItem views_format_items[];
- extern EnumPropertyItem views_format_multilayer_items[];
- extern EnumPropertyItem views_format_multiview_items[];
- extern EnumPropertyItem stereo3d_display_items[];
- extern EnumPropertyItem stereo3d_anaglyph_type_items[];
- extern EnumPropertyItem stereo3d_interlace_type_items[];
+ extern EnumPropertyItem rna_enum_event_value_items[];
+ extern EnumPropertyItem rna_enum_event_type_items[];
+ extern EnumPropertyItem rna_enum_operator_return_items[];
- extern EnumPropertyItem exr_codec_items[];
- extern EnumPropertyItem color_sets_items[];
+ extern EnumPropertyItem rna_enum_brush_sculpt_tool_items[];
+ extern EnumPropertyItem rna_enum_brush_vertex_tool_items[];
+ extern EnumPropertyItem rna_enum_brush_image_tool_items[];
- extern EnumPropertyItem beztriple_keyframe_type_items[];
- extern EnumPropertyItem beztriple_interpolation_mode_items[];
- extern EnumPropertyItem beztriple_interpolation_easing_items[];
- extern EnumPropertyItem keyframe_handle_type_items[];
++extern EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[];
+
- extern EnumPropertyItem keyblock_type_items[];
+ extern EnumPropertyItem rna_enum_symmetrize_direction_items[];
- extern EnumPropertyItem keyingset_path_grouping_items[];
- extern EnumPropertyItem keying_flag_items[];
+ extern EnumPropertyItem rna_enum_texture_type_items[];
- extern EnumPropertyItem keyframe_paste_offset_items[];
- extern EnumPropertyItem keyframe_paste_merge_items[];
+ extern EnumPropertyItem rna_enum_lamp_type_items[];
- extern EnumPropertyItem fmodifier_type_items[];
+ extern EnumPropertyItem rna_enum_unpack_method_items[];
- extern EnumPropertyItem nla_mode_extend_items[];
- extern EnumPropertyItem nla_mode_blend_items[];
+ extern EnumPropertyItem rna_enum_object_type_items[];
- extern EnumPropertyItem motionpath_bake_location_items[];
+ extern EnumPropertyItem rna_enum_object_type_curve_items[];
- extern EnumPropertyItem event_value_items[];
- extern EnumPropertyItem event_type_items[];
- extern EnumPropertyItem operator_return_items[];
+ extern EnumPropertyItem rna_enum_rigidbody_object_type_items[];
+ extern EnumPropertyItem rna_enum_rigidbody_object_shape_items[];
+ extern EnumPropertyItem rna_enum_rigidbody_constraint_type_items[];
- extern EnumPropertyItem brush_sculpt_tool_items[];
- extern EnumPropertyItem brush_vertex_tool_items[];
- extern EnumPropertyItem brush_image_tool_items[];
+ extern EnumPropertyItem rna_enum_object_axis_items[];
+ extern EnumPropertyItem rna_enum_object_axis_unsigned_items[];
- extern EnumPropertyItem gpencil_sculpt_brush_items[];
+ extern EnumPropertyItem rna_enum_controller_type_items[];
- extern EnumPropertyItem symmetrize_direction_items[];
+ extern EnumPropertyItem rna_enum_render_pass_type_items[];
+ extern EnumPropertyItem rna_enum_render_pass_debug_type_items[];
- extern EnumPropertyItem texture_type_items[];
+ extern EnumPropertyItem rna_enum_keymap_propvalue_items[];
- extern EnumPropertyItem lamp_type_items[];
+ extern EnumPropertyItem rna_enum_operator_context_items[];
- extern EnumPropertyItem unpack_method_items[];
+ extern EnumPropertyItem rna_enum_wm_report_items[];
- extern EnumPropertyItem object_type_items[];
+ extern EnumPropertyItem rna_enum_transform_mode_types[];
- extern EnumPropertyItem object_type_curve_items[];
+ extern EnumPropertyItem rna_enum_posebone_rotmode_items[];
- extern EnumPropertyItem rigidbody_object_type_items[];
- extern EnumPropertyItem rigidbody_object_shape_items[];
- extern EnumPropertyItem rigidbody_constraint_type_items[];
+ extern EnumPropertyItem rna_enum_property_type_items[];
+ extern EnumPropertyItem rna_enum_property_subtype_items[];
+ extern EnumPropertyItem rna_enum_property_unit_items[];
- extern EnumPropertyItem object_axis_items[];
- extern EnumPropertyItem object_axis_unsigned_items[];
+ extern EnumPropertyItem rna_enum_gameproperty_type_items[];
- extern EnumPropertyItem controller_type_items[];
+ extern EnumPropertyItem rna_enum_viewport_shade_items[];
- extern EnumPropertyItem render_pass_type_items[];
- extern EnumPropertyItem render_pass_debug_type_items[];
+ extern EnumPropertyItem rna_enum_navigation_mode_items[];
- extern EnumPropertyItem keymap_propvalue_items[];
+ extern EnumPropertyItem rna_enum_file_sort_items[];
- extern EnumPropertyItem operator_context_items[];
+ extern EnumPropertyItem rna_enum_node_socket_in_out_items[];
+ extern EnumPropertyItem rna_enum_node_icon_items[];
- extern EnumPropertyItem wm_report_items[];
+ extern EnumPropertyItem rna_enum_node_math_items[];
+ extern EnumPropertyItem rna_enum_node_vec_math_items[];
+ extern EnumPropertyItem rna_enum_node_filter_items[];
- extern EnumPropertyItem transform_mode_types[];
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list