[Bf-blender-cvs] [8c72669] master: Some corrections to previous commit. Undo stack could return 0 or return global undo even if not set in preferences.

[Antony Riakiotakis]

Commit: 8c726690628a56b4da868d01deae57dda0fd0827
Author: Antony Riakiotakis
Date:   Thu Mar 13 23:54:18 2014 +0200
https://developer.blender.org/rB8c726690628a56b4da868d01deae57dda0fd0827

Some corrections to previous commit. Undo stack could return 0 or return
global undo even if not set in preferences.

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

M	source/blender/editors/util/undo.c

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

diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c
index 60c761c..7aa5c7e 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;
 	}