[Bf-blender-cvs] [4413f481beb] master: Merge branch 'blender-v2.91-release'

[Hans Goudey]

Commit: 4413f481beb6b94a2b30838c5c4b7694085285cb
Author: Hans Goudey
Date:   Tue Nov 3 16:31:17 2020 -0600
Branches: master
https://developer.blender.org/rB4413f481beb6b94a2b30838c5c4b7694085285cb

Merge branch 'blender-v2.91-release'

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



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

diff --cc source/blender/editors/interface/interface.c
index db3bbc8a128,dc20e6f1813..d2f9b31cecd
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@@ -897,9 -809,31 +897,11 @@@ static bool ui_but_update_from_old_bloc
    }
  
    if (oldbut->active) {
 -    /* flags from the buttons we want to refresh, may want to add more here... */
 -    const int flag_copy = UI_BUT_REDALERT | UI_HAS_ICON;
 -
 -    found_active = true;
 -
 -#if 0
 -    but->flag = oldbut->flag;
 -    but->active = oldbut->active;
 -    but->pos = oldbut->pos;
 -    but->ofs = oldbut->ofs;
 -    but->editstr = oldbut->editstr;
 -    but->editval = oldbut->editval;
 -    but->editvec = oldbut->editvec;
 -    but->selsta = oldbut->selsta;
 -    but->selend = oldbut->selend;
 -    but->softmin = oldbut->softmin;
 -    but->softmax = oldbut->softmax;
 -    oldbut->active = NULL;
 -#endif
 -
 -    /* move button over from oldblock to new block */
 +    /* Move button over from oldblock to new block. */
      BLI_remlink(&oldblock->buttons, oldbut);
      BLI_insertlinkafter(&block->buttons, but, oldbut);
+     /* Add the old button to the button groups in the new block. */
+     ui_button_group_replace_but_ptr(block, but, oldbut);
      oldbut->block = block;
      *but_p = oldbut;