diff options
author | Ton Roosendaal <ton@blender.org> | 2004-11-13 01:16:23 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-11-13 01:16:23 +0300 |
commit | 7fae7b0cf95c2d95bd80a506002b7598500e497f (patch) | |
tree | 102f402cfa1e0067a2515ebcdab35327afaeb7bd | |
parent | ccc07d249abc42c3ea7a0c95823eabd1fe9dff60 (diff) |
- Disabled printf for undo (still works in debug mode blender -d)
- Made global undo to set default on 'old' files (2.34 too, so wait
with saving a .B.blend without glob undo until release is 2.35)
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 4 | ||||
-rw-r--r-- | source/blender/src/editmode_undo.c | 4 | ||||
-rw-r--r-- | source/blender/src/usiblender.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 90f3d327f1c..e1ccfb13357 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -561,7 +561,7 @@ void BKE_undo_step(int step) /* curundo should never be NULL, after restart or load file it should call undo_save */ if(curundo==NULL || curundo->prev==NULL) error("No undo available"); else { - printf("undo %s\n", curundo->name); + if(G.f & G_DEBUG) printf("undo %s\n", curundo->name); curundo= curundo->prev; read_undosave(curundo); } @@ -574,7 +574,7 @@ void BKE_undo_step(int step) else { read_undosave(curundo->next); curundo= curundo->next; - printf("redo %s\n", curundo->name); + if(G.f & G_DEBUG) printf("redo %s\n", curundo->name); } } } diff --git a/source/blender/src/editmode_undo.c b/source/blender/src/editmode_undo.c index 1c5aca9ff8f..9d55c6b314c 100644 --- a/source/blender/src/editmode_undo.c +++ b/source/blender/src/editmode_undo.c @@ -222,7 +222,7 @@ void undo_editmode_step(int step) if(curundo==NULL || curundo->prev==NULL) error("No more steps to undo"); else { - printf("undo %s\n", curundo->name); + if(G.f & G_DEBUG) printf("undo %s\n", curundo->name); curundo= curundo->prev; undo_restore(curundo); } @@ -234,7 +234,7 @@ void undo_editmode_step(int step) else { undo_restore(curundo->next); curundo= curundo->next; - printf("redo %s\n", curundo->name); + if(G.f & G_DEBUG) printf("redo %s\n", curundo->name); } } diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 13647fdbd90..cbe2afab524 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -230,10 +230,12 @@ int BIF_read_homefile(void) U.vrmlflag= USER_VRML_LAYERS; } - /* added seam, normal color */ + /* added seam, normal color, undo */ if (G.main->versionfile <= 234) { bTheme *btheme; + U.uiflag |= USER_GLOBALUNDO; + for(btheme= U.themes.first; btheme; btheme= btheme->next) { /* check for alpha==0 is safe, then color was never set */ if(btheme->tv3d.edge_seam[3]==0) { |