[Bf-blender-cvs] [934b3c74f32] master: Unit System: remove 'm' as an alternate name for mile
Campbell Barton
noreply at git.blender.org
Wed Jun 12 06:25:43 CEST 2019
Commit: 934b3c74f328c8942eef9a5cf1219cca3ad46cd0
Author: Campbell Barton
Date: Wed Jun 12 14:20:59 2019 +1000
Branches: master
https://developer.blender.org/rB934b3c74f328c8942eef9a5cf1219cca3ad46cd0
Unit System: remove 'm' as an alternate name for mile
Now when using imperial dimensions,
using 'm' suffix is treated as meters instead of miles
(use 'mi' or 'mile' instead).
Resolves T65731
===================================================================
M source/blender/blenkernel/intern/unit.c
===================================================================
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index f5b73d88867..7e7d5c82654 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -157,7 +157,7 @@ static struct bUnitDef buMetricLenDef[] = {
static const struct bUnitCollection buMetricLenCollection = {buMetricLenDef, 3, 0, UNIT_COLLECTION_LENGTH(buMetricLenDef)};
static struct bUnitDef buImperialLenDef[] = {
- {"mile", "miles", "mi", "m", "Miles", "MILES", UN_SC_MI, 0.0, B_UNIT_DEF_NONE},
+ {"mile", "miles", "mi", NULL, "Miles", "MILES", UN_SC_MI, 0.0, B_UNIT_DEF_NONE},
{"furlong", "furlongs", "fur", NULL, "Furlongs", "FURLONGS", UN_SC_FUR, 0.0, B_UNIT_DEF_SUPPRESS},
{"chain", "chains", "ch", NULL, "Chains", "CHAINS", UN_SC_CH, 0.0, B_UNIT_DEF_SUPPRESS},
{"yard", "yards", "yd", NULL, "Yards", "YARDS", UN_SC_YD, 0.0, B_UNIT_DEF_SUPPRESS},
More information about the Bf-blender-cvs
mailing list