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:
authorJacques Lucke <mail@jlucke.com>2019-01-08 21:20:22 +0300
committerJacques Lucke <mail@jlucke.com>2019-01-08 21:20:56 +0300
commit12e9d52882e32d85c3890b73aa5a21aff9c787fc (patch)
tree9310070fd82ebe51f5de205183409b4ee2f427a6 /source/blender/editors/util/numinput.c
parentae2af4692009fe2c3fc97783f6d69aaa7cac5123 (diff)
Fix T60327: Value input with adaptive imperial units not working properly
Diffstat (limited to 'source/blender/editors/util/numinput.c')
-rw-r--r--source/blender/editors/util/numinput.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c
index 52cf1b2d708..e3c0f6ca685 100644
--- a/source/blender/editors/util/numinput.c
+++ b/source/blender/editors/util/numinput.c
@@ -260,7 +260,7 @@ bool user_string_to_number(bContext *C, const char *str, const UnitSettings *uni
double unit_scale = BKE_scene_unit_scale(unit, type, 1.0);
if (!bUnit_ContainsUnit(str, unit->system, type)) {
int success = BPY_execute_string_as_number(C, NULL, str, true, r_value);
- *r_value *= bUnit_PreferredUnitScalar(unit, type);
+ *r_value *= bUnit_PreferredInputUnitScalar(unit, type);
*r_value /= unit_scale;
return success;
}