diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-24 14:46:52 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-24 14:46:52 +0400 |
| commit | 300df490601a4267a9c77239b5638e494672a38f (patch) | |
| tree | c7e40d44aa25096e9de7b675a330a901da923384 /source/blender/editors/interface/interface.c | |
| parent | 813f292fc961300343ff5c6b94591d69a69f7890 (diff) | |
Fix #19446: merge operator needs to be undone twice, interface
was still doing undo pushes in cases it was not needed.
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index f79f2f8c378..1b05958b679 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2271,8 +2271,9 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, char *str, short } } - if(!ELEM7(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, SEARCH_MENU)) - but->flag |= UI_BUT_UNDO; + if(ELEM8(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, SEARCH_MENU, BUTM)); + else if(ELEM5(but->type, SCROLL, SEPR, LINK, INLINK, FTPREVIEW)); + else but->flag |= UI_BUT_UNDO; BLI_addtail(&block->buttons, but); |