[Bf-blender-cvs] [fb84ef58c4f] master: Fix T67191: Redo fails for 3D text operations

Campbell Barton noreply at git.blender.org
Fri Jul 19 11:21:55 CEST 2019


Commit: fb84ef58c4faf71d3336903e1f307d3baffea362
Author: Campbell Barton
Date:   Fri Jul 19 19:19:36 2019 +1000
Branches: master
https://developer.blender.org/rBfb84ef58c4faf71d3336903e1f307d3baffea362

Fix T67191: Redo fails for 3D text operations

===================================================================

M	source/blender/editors/curve/editfont_undo.c

===================================================================

diff --git a/source/blender/editors/curve/editfont_undo.c b/source/blender/editors/curve/editfont_undo.c
index 8f8c23a7772..2f8f15bc6c7 100644
--- a/source/blender/editors/curve/editfont_undo.c
+++ b/source/blender/editors/curve/editfont_undo.c
@@ -62,7 +62,7 @@ typedef struct UndoFont {
   wchar_t *textbuf;
   struct CharInfo *textbufinfo;
 
-  int len, pos;
+  int len, pos, selstart, selend;
 
 #ifdef USE_ARRAY_STORE
   struct {
@@ -241,10 +241,10 @@ static void undofont_to_editfont(UndoFont *uf, Curve *cu)
   memcpy(ef->textbufinfo, uf->textbufinfo, final_size);
 
   ef->pos = uf->pos;
+  ef->selstart = uf->selstart;
+  ef->selend = uf->selend;
   ef->len = uf->len;
 
-  ef->selstart = ef->selend = 0;
-
 #ifdef USE_ARRAY_STORE
   uf_arraystore_expand_clear(uf);
 #endif
@@ -269,6 +269,8 @@ static void *undofont_from_editfont(UndoFont *uf, Curve *cu)
   memcpy(uf->textbufinfo, ef->textbufinfo, final_size);
 
   uf->pos = ef->pos;
+  uf->selstart = ef->selstart;
+  uf->selend = ef->selend;
   uf->len = ef->len;
 
 #ifdef USE_ARRAY_STORE



More information about the Bf-blender-cvs mailing list