Another step in the undo evolution.

- Made unified API for undo calls, to be found in space.c
  BIF_undo_push(char *str)
  BIF_undo(void)
  BIF_redo(void)
  These calls will do all undo levels, including editmode and vpaint.

  The transition is work in progress, because mesh undo needs recode.

- New global hotkey CTR+Z for undo
  Note: 'shaded draw mode' still is SHIFT+Z, the old CTRL+Z was to recalc
  the lighting in shaded mode, which already became much more interactive,
  like during/after any transform().
  Recalc hotkey now is SHIFT+ALT+Z

  CTRL+<any modifier>+Z is redo.

- For OSX users; the Apple-key ("Command") now maps to CTRL as well. This
  disables the one-mouse-button hack for rightmouse btw, will be fixed in
  next commit. At least we can use Apple-Z :)

- Old Ukey for undo is still there, as a training period... my preference is
  to restore Ukey to "reload original data" as in past, and only use new
  CTRL+Z for undo.

- Added undo_push() for all of editobject.c and editview.c. Meaning we can
  start using/testing global undo in the 3d window. Please dont comment on
  missing parts for now, first I want someone to volunteer to tackle all of
  that.

- Since the global undo has a full 'file' in memory, it can save extremely
  fast on exit to <temp dir>/quit.blend. That's default now when global undo
  is enabled. It prints "Saved session recovery to ..." in console then.

- In file menu, a new option is added "Recover Last Session". Note that this
  reads the undo-save, which is without UI.

- With such nice new features we then can also kill the disputed
  Cancel/Confirm menu on Q-KEY.

- Added fix which initializes seam/normal theme color on saved themes.
  They showed black now.... (Note: that's in usiblender.c!)

1 files changed, 21 insertions, 0 deletions

diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index 6d22e5a0dae..b337882d354 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -886,6 +886,26 @@ static void do_info_filemenu(void *arg, int event)
 	case 14:
 		G.fileflags ^= G_FILE_NO_UI;
 		break;
+	case 15:	/* recover previous session */
+		{
+			extern short winqueue_break; /* editscreen.c */
+			int save_over;
+			char str[FILE_MAXDIR+FILE_MAXFILE];
+			char scestr[FILE_MAXDIR+FILE_MAXFILE];
+			
+			strcpy(scestr, G.sce);	/* temporal store */
+			save_over = G.save_over;
+			BLI_make_file_string("/", str, U.tempdir, "quit.blend");
+			BKE_read_file(str, NULL);
+			G.save_over = save_over;
+			strcpy(G.sce, scestr);
+
+			winqueue_break= 1;	/* leave queues everywhere */
+		
+			BKE_reset_undo();
+			BKE_write_undo("original");	/* save current state */
+		}
+		break;
 	case 31: /* save default settings */
 		BIF_write_homefile();
 		break;
@@ -905,6 +925,7 @@ static uiBlock *info_filemenu(void *arg_unused)
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "New|Ctrl X",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Open...|F1",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reopen Last|Ctrl O",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Recover Last Session",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 15, "");
 
 	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");