From 96a51e99fb8a5dcb9e6b15eed876d7ea6f1cc94b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 28 Feb 2014 09:51:05 +0100 Subject: Fix T38877: F-Curve modal input is incorrect when set to Imperial units. Using length units outside of 3dview does not make sense... --- source/blender/editors/transform/transform.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 7cab4614606..d52b494131b 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4075,10 +4075,18 @@ static void initTranslation(TransInfo *t) copy_v3_fl(t->num.val_inc, t->snap[1]); t->num.unit_sys = t->scene->unit.system; - t->num.unit_type[0] = B_UNIT_LENGTH; - t->num.unit_type[1] = B_UNIT_LENGTH; - t->num.unit_type[2] = B_UNIT_LENGTH; - + if (t->spacetype == SPACE_VIEW3D) { + /* Handling units makes only sense in 3Dview... See T38877. */ + t->num.unit_type[0] = B_UNIT_LENGTH; + t->num.unit_type[1] = B_UNIT_LENGTH; + t->num.unit_type[2] = B_UNIT_LENGTH; + } + else { + /* SPACE_IPO, SPACE_ACTION, etc. could use some time units, when we have them... */ + t->num.unit_type[0] = B_UNIT_NONE; + t->num.unit_type[1] = B_UNIT_NONE; + t->num.unit_type[2] = B_UNIT_NONE; + } } static void headerTranslation(TransInfo *t, float vec[3], char str[MAX_INFO_LEN]) -- cgit v1.2.3