[Bf-blender-cvs] [28d5788] master: Fix "Flipped" drawn in edgeslide header text even when Even is disabled.

[Bastien Montagne]

Commit: 28d578871db6b8bf70c1cf6090099f9fdb79dee5
Author: Bastien Montagne
Date:   Thu Jan 2 09:46:23 2014 +0100
https://developer.blender.org/rB28d578871db6b8bf70c1cf6090099f9fdb79dee5

Fix "Flipped" drawn in edgeslide header text even when Even is disabled.

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

M	source/blender/editors/transform/transform.c

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 8dac8f0..3666130 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -6171,8 +6171,18 @@ static void applyEdgeSlide(TransInfo *t, const int UNUSED(mval[2]))
 
 		outputNumInput(&(t->num), c);
 
-		BLI_snprintf(str, MAX_INFO_LEN, IFACE_("Edge Slide: %s (E)ven: %s, (F)lipped: %s"),
-		             &c[0], WM_bool_as_string(!is_proportional), WM_bool_as_string(flipped));
+		if (is_proportional) {
+			BLI_snprintf(str, MAX_INFO_LEN, IFACE_("Edge Slide: %s (E)ven: %s"),
+			             &c[0], WM_bool_as_string(!is_proportional));
+		}
+		else {
+			BLI_snprintf(str, MAX_INFO_LEN, IFACE_("Edge Slide: %s (E)ven: %s, (F)lipped: %s"),
+			             &c[0], WM_bool_as_string(!is_proportional), WM_bool_as_string(flipped));
+		}
+	}
+	else if (is_proportional) {
+		BLI_snprintf(str, MAX_INFO_LEN, IFACE_("Edge Slide: %.4f (E)ven: %s"),
+		             final, WM_bool_as_string(!is_proportional));
 	}
 	else {
 		BLI_snprintf(str, MAX_INFO_LEN, IFACE_("Edge Slide: %.4f (E)ven: %s, (F)lipped: %s"),