[Bf-blender-cvs] [0d2d4a6d4a7] temp-ui-button-type-refactor: Merge branch 'master' into temp-ui-button-type-refactor

[Julian Eisel]

Commit: 0d2d4a6d4a75ac38c41f872c88255eab70e88ab7
Author: Julian Eisel
Date:   Fri Aug 7 13:04:31 2020 +0200
Branches: temp-ui-button-type-refactor
https://developer.blender.org/rB0d2d4a6d4a75ac38c41f872c88255eab70e88ab7

Merge branch 'master' into temp-ui-button-type-refactor

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



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

diff --cc source/blender/editors/interface/interface.c
index bc3d9b59583,c5d5fbb90c0..a84ca33a7d7
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@@ -1766,10 -1768,12 +1773,12 @@@ void UI_block_end_ex(const bContext *C
        }
      }
  
-     ui_but_anim_flag(but, (scene) ? scene->r.cfra : 0.0f);
-     ui_but_override_flag(but);
+     const AnimationEvalContext anim_eval_context = BKE_animsys_eval_context_construct(
+         depsgraph, (scene) ? scene->r.cfra : 0.0f);
+     ui_but_anim_flag(but, &anim_eval_context);
+     ui_but_override_flag(CTX_data_main(C), but);
      if (UI_but_is_decorator(but)) {
 -      ui_but_anim_decorate_update_from_flag(but);
 +      ui_but_anim_decorate_update_from_flag((uiButDecorator *)but);
      }
      ui_but_predefined_extra_operator_icons_add(but);
    }
diff --cc source/blender/editors/interface/interface_handlers.c
index a2170de8422,efbfcf8d19d..791e7ad7bb7
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -8429,10 -8427,10 +8439,10 @@@ void UI_context_update_anim_flag(const 
  
      for (block = region->uiblocks.first; block; block = block->next) {
        for (but = block->buttons.first; but; but = but->next) {
-         ui_but_anim_flag(but, (scene) ? scene->r.cfra : 0.0f);
-         ui_but_override_flag(but);
+         ui_but_anim_flag(but, &anim_eval_context);
+         ui_but_override_flag(CTX_data_main(C), but);
          if (UI_but_is_decorator(but)) {
 -          ui_but_anim_decorate_update_from_flag(but);
 +          ui_but_anim_decorate_update_from_flag((uiButDecorator *)but);
          }
  
          ED_region_tag_redraw(region);
diff --cc source/blender/editors/interface/interface_region_search.c
index 5c519368cca,80155e3e871..2010d89165e
--- a/source/blender/editors/interface/interface_region_search.c
+++ b/source/blender/editors/interface/interface_region_search.c
@@@ -279,14 -302,16 +302,19 @@@ bool ui_searchbox_inside(ARegion *regio
  bool ui_searchbox_apply(uiBut *but, ARegion *region)
  {
    uiSearchboxData *data = region->regiondata;
 +  uiButSearch *search_but = (uiButSearch *)but;
  
 -  but->func_arg2 = NULL;
 +  BLI_assert(but->type == UI_BTYPE_SEARCH_MENU);
 +
 +  search_but->item_active = NULL;
  
    if (data->active != -1) {
-     const char *name = data->items.names[data->active];
+     const char *name = data->items.names[data->active] +
+                        /* Never include the prefix in the button. */
+                        (data->items.name_prefix_offsets ?
+                             data->items.name_prefix_offsets[data->active] :
+                             0);
+ 
      const char *name_sep = data->use_sep ? strrchr(name, UI_SEP_CHAR) : NULL;
  
      BLI_strncpy(but->editstr, name, name_sep ? (name_sep - name) + 1 : data->items.maxstrlen);
diff --cc source/blender/editors/interface/interface_widgets.c
index 74c3bd9eeb5,52835b5474e..d38decd28d1
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@@ -1379,8 -1400,8 +1400,8 @@@ static void widget_draw_icon
        alpha *= but->a2;
      }
    }
 -  else if (ELEM(but->type, UI_BTYPE_BUT)) {
 +  else if (ELEM(but->type, UI_BTYPE_BUT, UI_BTYPE_DECORATOR)) {
-     if (but->flag & UI_BUT_DISABLED) {
+     if (but->flag & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
        alpha *= 0.5f;
      }
    }