[Bf-blender-cvs] [96a51e9] master: Fix T38877: F-Curve modal input is incorrect when set to Imperial units.

Bastien Montagne noreply at git.blender.org
Fri Feb 28 09:59:35 CET 2014


Commit: 96a51e99fb8a5dcb9e6b15eed876d7ea6f1cc94b
Author: Bastien Montagne
Date:   Fri Feb 28 09:51:05 2014 +0100
https://developer.blender.org/rB96a51e99fb8a5dcb9e6b15eed876d7ea6f1cc94b

Fix T38877: F-Curve modal input is incorrect when set to Imperial units.

Using length units outside of 3dview does not make sense...

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

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

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 7cab461..d52b494 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])




More information about the Bf-blender-cvs mailing list