diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-31 18:08:29 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-31 18:08:29 +0300 |
| commit | 7f36fb458cbea8083d3b863da18e1cfb1fc04e1f (patch) | |
| tree | 4d9f19950433d55d99fc4c0fbbc5c3056f0fa143 /source/blender/makesrna | |
| parent | fede95aa68774d920478928a02858f96897e1fda (diff) | |
| parent | 8a3b548cb2b2c7a05a4d0a1c613f788d38a04e85 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_rna.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 866ea771b0f..068f71c4080 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -121,6 +121,7 @@ const EnumPropertyItem rna_enum_property_unit_items[] = { {PROP_UNIT_TIME, "TIME", 0, "Time", ""}, {PROP_UNIT_VELOCITY, "VELOCITY", 0, "Velocity", ""}, {PROP_UNIT_ACCELERATION, "ACCELERATION", 0, "Acceleration", ""}, + {PROP_UNIT_MASS, "MASS", 0, "Mass", ""}, {PROP_UNIT_CAMERA, "CAMERA", 0, "Camera", ""}, {0, NULL, 0, NULL, NULL} }; |