[Bf-blender-cvs] [ead6d39] master: Units: Make grams base unit for mass
Sergej Reich
sergej.reich at googlemail.com
Sat Jan 4 04:27:37 CET 2014
Yeah, you're right of course :)
This was supposed to be a fix for a ui glitch.
Reverted this and committed a better fix now.
Thanks for catching this.
Am Samstag, den 04.01.2014, 11:41 +1100 schrieb Andrew Hale:
> Hi Sergej,
>
> Just wondering what the reason for changing this is? As the SI unit
> for mass is kilograms, I would have thought that having kilograms as
> the base unit would be correct.
>
> Thanks for any clarification!
> Andrew
>
> On 01/01/2014 4:14 AM, "Sergej Reich" <noreply at git.blender.org> wrote:
> Commit: ead6d397fda12d8287dff7d6a6fff6ea1948cd69
> Author: Sergej Reich
> Date: Tue Dec 31 18:01:07 2013 +0100
> https://developer.blender.org/rBead6d397fda12d8287dff7d6a6fff6ea1948cd69
>
> Units: Make grams base unit for mass
>
> ===================================================================
>
> M source/blender/blenkernel/intern/unit.c
>
> ===================================================================
>
> diff --git a/source/blender/blenkernel/intern/unit.c
> b/source/blender/blenkernel/intern/unit.c
> index 632ac62..bd6a466 100644
> --- a/source/blender/blenkernel/intern/unit.c
> +++ b/source/blender/blenkernel/intern/unit.c
> @@ -196,13 +196,13 @@ static struct bUnitCollection
> buImperialVolCollection = {buImperialVolDef, 4, 0,
> static struct bUnitDef buMetricMassDef[] = {
> {"ton", "tonnes", "ton", "t", "1000
> Kilograms", UN_SC_MTON, 0.0, B_UNIT_DEF_NONE},
> {"quintal", "quintals", "ql", "q", "100
> Kilograms", UN_SC_QL, 0.0, B_UNIT_DEF_SUPPRESS},
> - {"kilogram", "kilograms", "kg", NULL, "Kilograms",
> UN_SC_KG, 0.0, B_UNIT_DEF_NONE}, /* base unit */
> + {"kilogram", "kilograms", "kg", NULL, "Kilograms",
> UN_SC_KG, 0.0, B_UNIT_DEF_NONE},
> {"hectogram", "hectograms", "hg", NULL, "Hectograms",
> UN_SC_HG, 0.0, B_UNIT_DEF_SUPPRESS},
> {"dekagram", "dekagrams", "dag", NULL, "10 Grams",
> UN_SC_DAG, 0.0, B_UNIT_DEF_SUPPRESS},
> - {"gram", "grams", "g", NULL, "Grams",
> UN_SC_G, 0.0, B_UNIT_DEF_NONE},
> + {"gram", "grams", "g", NULL, "Grams",
> UN_SC_G, 0.0, B_UNIT_DEF_NONE}, /* base unit */
> {NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
> };
> -static struct bUnitCollection buMetricMassCollection =
> {buMetricMassDef, 2, 0, sizeof(buMetricMassDef) /
> sizeof(bUnitDef)};
> +static struct bUnitCollection buMetricMassCollection =
> {buMetricMassDef, 5, 0, sizeof(buMetricMassDef) /
> sizeof(bUnitDef)};
>
> static struct bUnitDef buImperialMassDef[] = {
> {"ton", "tonnes", "ton", "t", "Tonnes", UN_SC_ITON,
> 0.0, B_UNIT_DEF_NONE},
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
More information about the Bf-blender-cvs
mailing list