[Bf-blender-cvs] [ba4bc4c] pie-menus: Merge branch 'master' into pie-menus

[Campbell Barton]

Commit: ba4bc4c58ee4bb613813931b5766c277b85bb963
Author: Campbell Barton
Date:   Thu Aug 7 23:20:57 2014 +1000
Branches: pie-menus
https://developer.blender.org/rBba4bc4c58ee4bb613813931b5766c277b85bb963

Merge branch 'master' into pie-menus

Conflicts:
	source/blender/editors/interface/interface_intern.h

===================================================================



===================================================================

diff --cc source/blender/editors/interface/interface_intern.h
index 21fbf05,7d03aae..d3ff1c7
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@@ -602,11 -560,8 +603,11 @@@ extern bool ui_button_is_active(struct 
  extern int ui_button_open_menu_direction(uiBut *but);
  extern void ui_button_text_password_hide(char password_str[UI_MAX_DRAW_STR], uiBut *but, const bool restore);
  extern uiBut *ui_but_find_activated(struct ARegion *ar);
+ bool ui_but_is_editable(const uiBut *but);
 +void ui_but_pie_dir_visual(RadialDirection dir, float vec[2]);
 +void ui_but_pie_dir(RadialDirection dir, float vec[2]);
 +void ui_block_calculate_pie_segment(struct uiBlock *block, const float event_xy[2]);
  
- 
  void ui_button_clipboard_free(void);
  void ui_panel_menu(struct bContext *C, ARegion *ar, Panel *pa);
  uiBut *ui_but_find_old(uiBlock *block_old, const uiBut *but_new);