diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-03-14 01:54:18 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-03-14 01:54:18 +0400 |
| commit | 8c726690628a56b4da868d01deae57dda0fd0827 (patch) | |
| tree | a68abafd55f8806c7dcaffee238276db27814d6d /source | |
| parent | 93684d5b5e3dcc6b9f0d4130ff5bdab86d2f7981 (diff) | |
Some corrections to previous commit. Undo stack could return 0 or return
global undo even if not set in preferences.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/util/undo.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 60c761cc12d..7aa5c7ee766 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -450,8 +450,6 @@ static int get_undo_system(bContext *C) if ((obact && (obact->mode & OB_MODE_TEXTURE_PAINT)) || (sima->mode == SI_MODE_PAINT)) { if (!ED_undo_paint_empty(UNDO_PAINT_IMAGE)) return UNDOSYSTEM_IMAPAINT; - else - return UNDOSYSTEM_GLOBAL; } } /* find out which undo system */ @@ -469,11 +467,9 @@ static int get_undo_system(bContext *C) else if (obact->mode & OB_MODE_TEXTURE_PAINT) { if (!ED_undo_paint_empty(UNDO_PAINT_IMAGE)) return UNDOSYSTEM_IMAPAINT; - else - return UNDOSYSTEM_GLOBAL; } } - else if (U.uiflag & USER_GLOBALUNDO) + if (U.uiflag & USER_GLOBALUNDO) return UNDOSYSTEM_GLOBAL; } |