diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-19 19:13:31 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-19 19:13:31 +0300 |
| commit | 1c75533d9cc0693733bacbadecfaac5c504313fb (patch) | |
| tree | 865ca6cfc8f2ea136d7ff2462e435151e612d06d /measureit | |
| parent | 4179941c58871bf85cf275130af0696affa5040f (diff) | |
| parent | d7d3233715503ecc15b8dd1973f7e73257e2cbda (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'measureit')
| -rw-r--r-- | measureit/__init__.py | 4 | ||||
| -rw-r--r-- | measureit/measureit_geometry.py | 2 | ||||
| -rw-r--r-- | measureit/measureit_main.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/measureit/__init__.py b/measureit/__init__.py index 8c69421a..a030fe73 100644 --- a/measureit/__init__.py +++ b/measureit/__init__.py @@ -231,7 +231,7 @@ def register(): Scene.measureit_units = EnumProperty(items=(('1', "Automatic", "Use scene units"), ('2', "Meters", ""), ('3', "Centimeters", ""), - ('4', "Milimiters", ""), + ('4', "Millimeters", ""), ('5', "Feet", ""), ('6', "Inches", "")), name="Units", @@ -319,7 +319,7 @@ def register(): default=15, min=6, max=500) Scene.measureit_debug = BoolProperty(name="Debug", - description="Display information for debuging" + description="Display information for debugging" " (expand/collapse for enabling or disabling)" " this information is only renderered for " "selected objects", diff --git a/measureit/measureit_geometry.py b/measureit/measureit_geometry.py index 46e930c3..3b2e0186 100644 --- a/measureit/measureit_geometry.py +++ b/measureit/measureit_geometry.py @@ -1431,7 +1431,7 @@ def format_distance(fmt, units, value, factor=1): d_cm = value * (100 ** factor) tx_dist = fmt % d_cm # ------------------------ - # Units milimiters + # Units millimeters # ------------------------ elif units == "4": if hide_units is False: diff --git a/measureit/measureit_main.py b/measureit/measureit_main.py index d63ac5ce..91d57ce8 100644 --- a/measureit/measureit_main.py +++ b/measureit/measureit_main.py @@ -256,7 +256,7 @@ class MeasureitProperties(PropertyGroup): description="Create full circunference", default=False) glarc_extrad = BoolProperty(name="arcextrad", - description="Adapt radio lengh to arc line", + description="Adapt radio length to arc line", default=True) glarc_rad = BoolProperty(name="arc rad", description="Show arc radius", |