[Bf-blender-cvs] [a038fa5d40d] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Wed Oct 18 10:23:10 CEST 2017
Commit: a038fa5d40d1a8849a7d7154659fa05e70578e4a
Author: Antonio Vazquez
Date: Wed Oct 18 10:19:42 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa038fa5d40d1a8849a7d7154659fa05e70578e4a
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/editors/object/object_edit.c
index 2ccb71811c7,771915a06dc..4f22eadeca2
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -1393,11 -1393,13 +1393,12 @@@ static void UNUSED_FUNCTION(image_aspec
}
- static EnumPropertyItem *object_mode_set_itemsf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
+ static const EnumPropertyItem *object_mode_set_itemsf(
+ bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
{
- EnumPropertyItem *input = rna_enum_object_mode_items;
+ const 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 467fc81aa29,760ddb34368..8689cc3cdb6
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@@ -36,173 -36,172 +36,173 @@@ struct bNodeSocketType
/* Types */
/* use in cases where only dynamic types are used */
- extern EnumPropertyItem DummyRNA_NULL_items[];
- extern EnumPropertyItem DummyRNA_DEFAULT_items[];
+ extern const EnumPropertyItem DummyRNA_NULL_items[];
+ extern const EnumPropertyItem DummyRNA_DEFAULT_items[];
/* all others should follow 'rna_enum_*_items' naming */
- extern EnumPropertyItem rna_enum_id_type_items[];
+ extern const 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_object_gpencil_type_items[];
- extern EnumPropertyItem rna_enum_metaelem_type_items[];
+ extern const EnumPropertyItem rna_enum_object_mode_items[];
+ extern const EnumPropertyItem rna_enum_object_empty_drawtype_items[];
++extern const EnumPropertyItem rna_enum_object_gpencil_type_items[];
+ extern const 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_curve_fit_method_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_layer_collection_mode_settings_type_items[];
+ extern const EnumPropertyItem rna_enum_proportional_falloff_items[];
+ extern const EnumPropertyItem rna_enum_proportional_falloff_curve_only_items[];
+ extern const EnumPropertyItem rna_enum_proportional_editing_items[];
+ extern const EnumPropertyItem rna_enum_snap_target_items[];
+ extern const EnumPropertyItem rna_enum_snap_element_items[];
+ extern const EnumPropertyItem rna_enum_snap_node_element_items[];
+ extern const EnumPropertyItem rna_enum_curve_fit_method_items[];
+ extern const EnumPropertyItem rna_enum_mesh_select_mode_items[];
+ extern const EnumPropertyItem rna_enum_mesh_delimit_mode_items[];
+ extern const EnumPropertyItem rna_enum_space_type_items[];
+ extern const EnumPropertyItem rna_enum_region_type_items[];
+ extern const EnumPropertyItem rna_enum_object_modifier_type_items[];
+ extern const EnumPropertyItem rna_enum_constraint_type_items[];
+ extern const EnumPropertyItem rna_enum_boidrule_type_items[];
+ extern const EnumPropertyItem rna_enum_sequence_modifier_type_items[];
+ extern const EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[];
- extern EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[];
- extern EnumPropertyItem rna_enum_modifier_triangulate_ngon_method_items[];
+ extern const EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[];
+ extern const 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 const EnumPropertyItem rna_enum_image_type_items[];
+ extern const EnumPropertyItem rna_enum_image_color_mode_items[];
+ extern const EnumPropertyItem rna_enum_image_color_depth_items[];
+ extern const 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 const EnumPropertyItem rna_enum_normal_space_items[];
+ extern const EnumPropertyItem rna_enum_normal_swizzle_items[];
+ extern const 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 const EnumPropertyItem rna_enum_views_format_items[];
+ extern const EnumPropertyItem rna_enum_views_format_multilayer_items[];
+ extern const EnumPropertyItem rna_enum_views_format_multiview_items[];
+ extern const EnumPropertyItem rna_enum_stereo3d_display_items[];
+ extern const EnumPropertyItem rna_enum_stereo3d_anaglyph_type_items[];
+ extern const EnumPropertyItem rna_enum_stereo3d_interlace_type_items[];
- extern EnumPropertyItem rna_enum_exr_codec_items[];
- extern EnumPropertyItem rna_enum_color_sets_items[];
+ extern const EnumPropertyItem rna_enum_exr_codec_items[];
+ extern const 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 const EnumPropertyItem rna_enum_beztriple_keyframe_type_items[];
+ extern const EnumPropertyItem rna_enum_beztriple_interpolation_mode_items[];
+ extern const EnumPropertyItem rna_enum_beztriple_interpolation_easing_items[];
+ extern const EnumPropertyItem rna_enum_keyframe_handle_type_items[];
- extern EnumPropertyItem rna_enum_keyblock_type_items[];
+ extern const EnumPropertyItem rna_enum_keyblock_type_items[];
- extern EnumPropertyItem rna_enum_keyingset_path_grouping_items[];
- extern EnumPropertyItem rna_enum_keying_flag_items[];
+ extern const EnumPropertyItem rna_enum_keyingset_path_grouping_items[];
+ extern const EnumPropertyItem rna_enum_keying_flag_items[];
- extern EnumPropertyItem rna_enum_keyframe_paste_offset_items[];
- extern EnumPropertyItem rna_enum_keyframe_paste_merge_items[];
+ extern const EnumPropertyItem rna_enum_keyframe_paste_offset_items[];
+ extern const EnumPropertyItem rna_enum_keyframe_paste_merge_items[];
- extern EnumPropertyItem rna_enum_fmodifier_type_items[];
+ extern const EnumPropertyItem rna_enum_fmodifier_type_items[];
- extern EnumPropertyItem rna_enum_nla_mode_extend_items[];
- extern EnumPropertyItem rna_enum_nla_mode_blend_items[];
+ extern const EnumPropertyItem rna_enum_nla_mode_extend_items[];
+ extern const EnumPropertyItem rna_enum_nla_mode_blend_items[];
- extern EnumPropertyItem rna_enum_motionpath_bake_location_items[];
+ extern const EnumPropertyItem rna_enum_motionpath_bake_location_items[];
- extern EnumPropertyItem rna_enum_event_value_items[];
- extern EnumPropertyItem rna_enum_event_type_items[];
- extern EnumPropertyItem rna_enum_operator_return_items[];
+ extern const EnumPropertyItem rna_enum_event_value_items[];
+ extern const EnumPropertyItem rna_enum_event_type_items[];
+ extern const EnumPropertyItem rna_enum_operator_return_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 const EnumPropertyItem rna_enum_brush_sculpt_tool_items[];
+ extern const EnumPropertyItem rna_enum_brush_vertex_tool_items[];
+ extern const EnumPropertyItem rna_enum_brush_image_tool_items[];
- extern EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[];
+ extern const EnumPropertyItem rna_enum_gpencil_sculpt_brush_items[];
- extern EnumPropertyItem rna_enum_uv_sculpt_tool_items[];
+ extern const EnumPropertyItem rna_enum_uv_sculpt_tool_items[];
- extern EnumPropertyItem rna_enum_axis_xy_items[];
- extern EnumPropertyItem rna_enum_axis_xyz_items[];
+ extern const EnumPropertyItem rna_enum_axis_xy_items[];
+ extern const EnumPropertyItem rna_enum_axis_xyz_items[];
- extern EnumPropertyItem rna_enum_axis_flag_xyz_items[];
+ extern const EnumPropertyItem rna_enum_axis_flag_xyz_items[];
- extern EnumPropertyItem rna_enum_symmetrize_direction_items[];
+ extern const EnumPropertyItem rna_enum_symmetrize_direction_items[];
- extern EnumPropertyItem rna_enum_texture_type_items[];
+ extern const EnumPropertyItem rna_enum_texture_type_items[];
- extern EnumPropertyItem rna_enum_lamp_type_items[];
+ extern const EnumPropertyItem rna_enum_lamp_type_items[];
- extern EnumPropertyItem rna_enum_unpack_method_items[];
+ extern const EnumPropertyItem rna_enum_unpack_method_items[];
- extern EnumPropertyItem rna_enum_object_type_items[];
+ extern const EnumPropertyItem rna_enum_object_type_items[];
- extern EnumPropertyItem rna_enum_object_type_curve_items[];
+ extern cons
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list