archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix own error in recent commit with red-alert flag becoming stale

Browse Source
This commit is contained in:
Campbell Barton
2014-02-13 09:12:47 +11:00
parent aea00c7a81
commit 9cc380e026
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/interface.c
View File

@@ -583,8 +583,6 @@ static void ui_but_update_linklines(uiBlock *block, uiBut *oldbut, uiBut *newbut
*/
static bool ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut **but_p, uiBut **but_old_p)
{
/* flags from the buttons we want to refresh, may want to add more here... */
const int flag_copy = UI_BUT_REDALERT | UI_BUT_DRAG_MULTI;
const int drawflag_copy = 0; /* None currently. */
uiBlock *oldblock = block->oldblock;
@@ -617,6 +615,9 @@ static bool ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBu
}
if (oldbut->active) {
/* flags from the buttons we want to refresh, may want to add more here... */
const int flag_copy = UI_BUT_REDALERT;
found_active = true;
#if 0
@@ -695,6 +696,8 @@ static bool ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBu
/* note: if layout hasn't been applied yet, it uses old button pointers... */
}
else {
const int flag_copy = UI_BUT_DRAG_MULTI;
but->flag = (but->flag & ~flag_copy) | (oldbut->flag & flag_copy);
/* ensures one button can get activated, and in case the buttons