[Bf-blender-cvs] [afc5f82d8d0] master: Fix typos related to units

[Vaishnav S]

Commit: afc5f82d8d07a3cfba6588eaee40e86da5ea7482
Author: Vaishnav S
Date:   Wed Feb 27 13:22:55 2019 +0100
Branches: master
https://developer.blender.org/rBafc5f82d8d07a3cfba6588eaee40e86da5ea7482

Fix typos related to units

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

M	source/blender/blenkernel/intern/unit.c
M	source/blender/python/intern/bpy_props.c

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

diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index 54bfa797258..2d2db5fea1e 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -310,7 +310,7 @@ static struct bUnitDef buPowerDef[] = {
 	{"watt",      "watts",      "W",  NULL, "Watts",      NULL, 1.0f,  0.0, B_UNIT_DEF_NONE}, /* base unit */
 	{"milliwatt", "milliwatts", "mW", NULL, "Milliwatts", NULL, 1e-3f, 0.0, B_UNIT_DEF_CASE_SENSITIVE},
 	{"microwatt", "microwatts", "µW", "uW", "Microwatts", NULL, 1e-6f, 0.0, B_UNIT_DEF_NONE},
-	{"nanowatt",  "nanowatts",  "nW", NULL, "Nannowatts", NULL, 1e-9f, 0.0, B_UNIT_DEF_NONE},
+	{"nanowatt",  "nanowatts",  "nW", NULL, "Nanowatts",  NULL, 1e-9f, 0.0, B_UNIT_DEF_NONE},
 	NULL_UNIT,
 };
 static struct bUnitCollection buPowerCollection = {buPowerDef, 3, 0, UNIT_COLLECTION_LENGTH(buPowerDef)};
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c
index c3c891ff6fc..385b02f231e 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -130,7 +130,7 @@ static const EnumPropertyItem property_subtype_array_items[] = {
 	{PROP_COLOR_GAMMA, "COLOR_GAMMA", 0, "Color Gamma", ""},
 	{PROP_LAYER, "LAYER", 0, "Layer", ""},
 	{PROP_LAYER_MEMBER, "LAYER_MEMBER", 0, "Layer Member", ""},
-	{PROP_POWER, "Power", 0, "Power", ""},
+	{PROP_POWER, "POWER", 0, "Power", ""},
 
 	{PROP_NONE, "NONE", 0, "None", ""},
 	{0, NULL, 0, NULL, NULL},