[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15713] branches/soc-2008-quorn/source/ blender/blenkernel/intern/text.c: Bugfix: Deleting backward selected text was getting stuck on redo.

Ian Thompson quornian at googlemail.com
Wed Jul 23 14:59:07 CEST 2008


Revision: 15713
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15713
Author:   quorn
Date:     2008-07-23 14:59:05 +0200 (Wed, 23 Jul 2008)

Log Message:
-----------
Bugfix: Deleting backward selected text was getting stuck on redo.

Selections were not correctly preserved through undo/redo operations causing unexpected behaviour.

Modified Paths:
--------------
    branches/soc-2008-quorn/source/blender/blenkernel/intern/text.c

Modified: branches/soc-2008-quorn/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2008-quorn/source/blender/blenkernel/intern/text.c	2008-07-23 12:27:08 UTC (rev 15712)
+++ branches/soc-2008-quorn/source/blender/blenkernel/intern/text.c	2008-07-23 12:59:05 UTC (rev 15713)
@@ -1821,6 +1821,12 @@
 			
 			break;
 	}
+
+	/* next undo step may need evaluating */
+	if (text->undo_pos>=0 && text->undo_buf[text->undo_pos] == UNDO_STO) {
+		txt_do_undo(text);
+		txt_do_redo(text); /* selections need restoring */
+	}
 	
 	undoing= 0;	
 }
@@ -1895,7 +1901,7 @@
 
 		case UNDO_SWAP:
 			txt_curs_swap(text);
-			txt_do_undo(text); /* swaps should appear transparent a*/
+			txt_do_redo(text); /* swaps should appear transparent a*/
 			break;
 			
 		case UNDO_CTO:





More information about the Bf-blender-cvs mailing list