Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-01-02 12:46:23 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-01-02 15:04:10 +0400
commit28d578871db6b8bf70c1cf6090099f9fdb79dee5 (patch)
treee49c196b41aaccdb13ba6ea6a11997d4d755e794 /source/blender/editors/transform
parentaef307cf31bee6f894069a3a995c8de1db73c9c3 (diff)
Fix "Flipped" drawn in edgeslide header text even when Even is disabled.
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 8dac8f08e4d..366613033c0 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"),