Revision: 23448 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23448 Author: blendix Date: 2009-09-24 12:46:52 +0200 (Thu, 24 Sep 2009)
Log Message: ----------- Fix #19446: merge operator needs to be undone twice, interface was still doing undo pushes in cases it was not needed. Modified Paths: -------------- trunk/blender/source/blender/editors/interface/interface.c Modified: trunk/blender/source/blender/editors/interface/interface.c =================================================================== --- trunk/blender/source/blender/editors/interface/interface.c 2009-09-24 10:41:28 UTC (rev 23447) +++ trunk/blender/source/blender/editors/interface/interface.c 2009-09-24 10:46:52 UTC (rev 23448) @@ -2271,8 +2271,9 @@ } } - 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); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs