[Bf-blender-cvs] [c7f23915bbe] asset-system-filelist: Merge branch 'master' into asset-system-filelist

[Julian Eisel]

Commit: c7f23915bbe347b1a13c8551b09198d9e0a35d93
Author: Julian Eisel
Date:   Sun May 23 19:10:33 2021 +0200
Branches: asset-system-filelist
https://developer.blender.org/rBc7f23915bbe347b1a13c8551b09198d9e0a35d93

Merge branch 'master' into asset-system-filelist

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



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

diff --cc source/blender/editors/interface/interface_intern.h
index 21ac4ca7245,23856c41ceb..4d40a3a3af3
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@@ -942,11 -933,8 +942,9 @@@ extern void ui_but_execute_end(struct b
                                 uiBut *but,
                                 void *active_back);
  extern void ui_but_active_free(const struct bContext *C, uiBut *but);
 +extern void ui_but_update_view_for_active(const struct bContext *C, const uiBlock *block);
  extern int ui_but_menu_direction(uiBut *but);
- extern void ui_but_text_password_hide(char password_str[UI_MAX_DRAW_STR],
-                                       uiBut *but,
-                                       const bool restore);
+ extern void ui_but_text_password_hide(char password_str[128], uiBut *but, const bool restore);
  extern uiBut *ui_but_find_select_in_enum(uiBut *but, int direction);
  bool ui_but_is_editing(const uiBut *but);
  float ui_block_calc_pie_segment(struct uiBlock *block, const float event_xy[2]);