[Bf-blender-cvs] [a2e209f20a4] blender2.8: Merge branch 'master' into blender2.8

[Brecht Van Lommel]

Commit: a2e209f20a44d14c1c56ba9f69b6589c318c7199
Author: Brecht Van Lommel
Date:   Sat Nov 24 23:44:17 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBa2e209f20a44d14c1c56ba9f69b6589c318c7199

Merge branch 'master' into blender2.8

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



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

diff --cc release/scripts/startup/bl_operators/uvcalc_smart_project.py
index 1695b012108,2acf431c577..7097613b88f
--- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py
+++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
@@@ -993,10 -1057,9 +993,9 @@@ class SmartProject(Operator)
          min=1.0, max=89.0,
          default=66.0,
      )
 -    island_margin = FloatProperty(
 +    island_margin: FloatProperty(
          name="Island Margin",
          description="Margin to reduce bleed from adjacent islands",
-         unit='LENGTH', subtype='DISTANCE',
          min=0.0, max=1.0,
          default=0.0,
      )