archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Some corrections to previous commit. Undo stack could return 0 or return

Browse Source 
global undo even if not set in preferences.
This commit is contained in:
Antonis Ryakiotakis
2014-03-13 23:54:18 +02:00
parent 93684d5b5e
commit 8c72669062
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/util/undo.c
View File

@@ -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;
}