Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 24 Nov 2018 22:44:17 +0000 (23:44 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 24 Nov 2018 22:44:17 +0000 (23:44 +0100)
1  2 
intern/ghost/intern/GHOST_SystemX11.cpp
release/scripts/startup/bl_operators/uvcalc_smart_project.py
source/blender/makesrna/intern/rna_sequencer.c

@@@ -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,
      )