[Bf-blender-cvs] [1164721] wiggly-widgets: Merge branch 'master' into wiggly-widgets
Julian Eisel
noreply at git.blender.org
Tue Nov 24 08:55:59 CET 2015
Commit: 1164721e12f7bf9c49157919fd696f681f8b9b93
Author: Julian Eisel
Date: Tue Nov 24 08:49:30 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB1164721e12f7bf9c49157919fd696f681f8b9b93
Merge branch 'master' into wiggly-widgets
Conflicts:
source/blender/editors/include/ED_view3d.h
source/blender/makesrna/RNA_enum_types.h
===================================================================
===================================================================
diff --cc source/blender/editors/include/ED_view3d.h
index 47ac51b,f325aba..c64ca74
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -400,9 -395,18 +400,21 @@@ void ED_view3d_operator_properties_view
void ED_view3d_operator_properties_viewmat_get(struct wmOperator *op, int *winx, int *winy, float persmat[4][4]);
#endif
+ bool ED_view3d_snap_from_region(
+ struct Scene *scene, struct View3D *v3d, struct ARegion *ar,
+ const float mval[2], float dist_px,
+ bool use_depth, bool use_obedit,
+ bool use_vert, bool use_edge, bool use_face,
+ float r_co[3], float r_no[3]);
+
+ bool ED_view3d_snap_from_ray(
+ struct Scene *scene,
+ const float ray_start[3], const float ray_normal[3],
+ float r_co[3]);
+
+int WIDGETGROUP_lamp_poll(const struct bContext *C, struct wmWidgetGroupType *wgrouptype);
+void WIDGETGROUP_lamp_create(const struct bContext *C, struct wmWidgetGroup *wgroup);
+
/* render */
void ED_view3d_stop_render_preview(struct wmWindowManager *wm, struct ARegion *ar);
void ED_view3d_shade_update(struct Main *bmain, struct Scene *scene, struct View3D *v3d, struct ScrArea *sa);
diff --cc source/blender/makesrna/RNA_enum_types.h
index 7af42df,0066236..55441db
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@@ -41,122 -39,157 +39,158 @@@ 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 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_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 modifier_triangulate_quad_method_items[];
- extern EnumPropertyItem modifier_triangulate_ngon_method_items[];
+ extern EnumPropertyItem rna_enum_modifier_triangulate_quad_method_items[];
+ extern EnumPropertyItem rna_enum_modifier_triangulate_ngon_method_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_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 normal_space_items[];
- extern EnumPropertyItem normal_swizzle_items[];
- extern EnumPropertyItem bake_save_mode_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 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_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 exr_codec_items[];
- extern EnumPropertyItem color_sets_items[];
+ extern EnumPropertyItem rna_enum_exr_codec_items[];
+ extern EnumPropertyItem rna_enum_color_sets_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_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 keyblock_type_items[];
+ extern EnumPropertyItem rna_enum_keyblock_type_items[];
- extern EnumPropertyItem keyingset_path_grouping_items[];
- extern EnumPropertyItem keying_flag_items[];
+ extern EnumPropertyItem rna_enum_keyingset_path_grouping_items[];
+ extern EnumPropertyItem rna_enum_keying_flag_items[];
- extern EnumPropertyItem keyframe_paste_offset_items[];
- extern EnumPropertyItem keyframe_paste_merge_items[];
+ extern EnumPropertyItem rna_enum_keyframe_paste_offset_items[];
+ extern EnumPropertyItem rna_enum_keyframe_paste_merge_items[];
- extern EnumPropertyItem fmodifier_type_items[];
+ extern EnumPropertyItem rna_enum_fmodifier_type_items[];
- extern EnumPropertyItem nla_mode_extend_items[];
- extern EnumPropertyItem nla_mode_blend_items[];
+ extern EnumPropertyItem rna_enum_nla_mode_extend_items[];
+ extern EnumPropertyItem rna_enum_nla_mode_blend_items[];
- extern EnumPropertyItem motionpath_bake_location_items[];
+ extern EnumPropertyItem rna_enum_motionpath_bake_location_items[];
- extern EnumPropertyItem event_value_items[];
- extern EnumPropertyItem event_type_items[];
- extern EnumPropertyItem operator_return_items[];
+ extern EnumPropertyItem rna_enum_event_value_items[];
+ extern EnumPropertyItem rna_enum_event_type_items[];
+ extern EnumPropertyItem rna_enum_operator_return_items[];
- extern EnumPropertyItem brush_sculpt_tool_items[];
- extern EnumPropertyItem brush_vertex_tool_items[];
- extern EnumPropertyItem brush_image_tool_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 symmetrize_direction_items[];
+ extern EnumPropertyItem rna_enum_symmetrize_direction_items[];
- extern EnumPropertyItem texture_type_items[];
+ extern EnumPropertyItem rna_enum_texture_type_items[];
- extern EnumPropertyItem lamp_type_items[];
+ extern EnumPropertyItem rna_enum_lamp_type_items[];
- extern EnumPropertyItem unpack_method_items[];
+ extern EnumPropertyItem rna_enum_unpack_method_items[];
- extern EnumPropertyItem object_type_items[];
+ extern EnumPropertyItem rna_enum_object_type_items[];
- extern EnumPropertyItem object_type_curve_items[];
+ extern EnumPropertyItem rna_enum_object_type_curve_items[];
- extern EnumPropertyItem rigidbody_object_type_items[];
- extern EnumPropertyItem rigidbody_object_shape_items[];
- extern EnumPropertyItem rigidbody_constraint_type_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 object_axis_items[];
- extern EnumPropertyItem object_axis_unsigned_items[];
+ extern EnumPropertyItem rna_enum_object_axis_items[];
+ extern EnumPropertyItem rna_enum_object_axis_unsigned_items[];
- extern EnumPropertyItem controller_type_items[];
+ extern EnumPropertyItem rna_enum_controller_type_items[];
- extern EnumPropertyItem render_pass_type_items[];
- extern EnumPropertyItem render_pass_debug_type_items[];
+ extern EnumPropertyItem rna_enum_render_pass_type_items[];
+ extern EnumPropertyItem rna_enum_render_pass_debug_type_items[];
- extern EnumPropertyItem keymap_propvalue_items[];
+ extern EnumPropertyItem rna_enum_keymap_propvalue_items[];
- extern EnumPropertyItem operator_context_items[];
+ extern EnumPropertyItem rna_enum_operator_context_items[];
- extern EnumPropertyItem wm_report_items[];
+ extern EnumPropertyItem rna_enum_wm_report_items[];
+extern EnumPropertyItem wm_widget_type_items[];
- extern EnumPropertyItem transform_mode_types[];
+ extern EnumPropertyItem rna_enum_transform_mode_types[];
+
+ extern EnumPropertyItem rna_enum_posebone_rotmode_items[];
+
+ extern EnumPropertyItem rna_enum_property_type_items[];
+ extern EnumPropertyItem rna_enum_property_subtype_items[];
+ extern EnumPropertyItem rna_enum_property_unit_items[];
+
+ exte
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list