Revision: 15119
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15119
Author:   quorn
Date:     2008-06-04 18:03:19 +0200 (Wed, 04 Jun 2008)

Log Message:
-----------
Fixed unreported bug: Backspace at top of text pushed newline onto undo stack

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-06-04 15:06:24 UTC (rev 15118)
+++ branches/soc-2008-quorn/source/blender/blenkernel/intern/text.c     
2008-06-04 16:03:19 UTC (rev 15119)
@@ -2075,13 +2075,13 @@
          return;
        }
        else if (text->curc==0) { /* Appending two lines */
-           if (text->curl->prev) {
-             text->curl= text->curl->prev;
-             text->curc= text->curl->len;
-                       
-             txt_combine_lines(text, text->curl, text->curl->next);
-             txt_pop_sel(text);
-           }
+               if (!text->curl->prev) return;
+               
+               text->curl= text->curl->prev;
+               text->curc= text->curl->len;
+               
+               txt_combine_lines(text, text->curl, text->curl->next);
+               txt_pop_sel(text);
        } 
        else { /* Just backspacing a char */
          int i= text->curc-1;


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to