diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
commit | be403891652a375e5a0ac61b493342ca6d39afb7 (patch) | |
tree | ef9637103db6d66c4b311cba5b705d575562a1f8 /release/scripts | |
parent | 060fdb49d64857ff1cbf9937420ed70b10b17086 (diff) | |
parent | cbc7aa80d49e3b36c9ecc0e27ec528b34c491fc1 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_operators/uvcalc_smart_project.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index 411c318643b..25783653414 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -1067,6 +1067,7 @@ class SmartProject(Operator): 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, ) diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index fda3096a3f5..d52705bce6e 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -581,10 +581,6 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): layout.row().prop(part, "physics_type", expand=True) row = layout.row() - col = row.column(align=True) - col.prop(part, "particle_size") - col.prop(part, "size_random", slider=True) - if part.physics_type != 'NO': col = row.column(align=True) col.prop(part, "mass") @@ -1088,7 +1084,8 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): col = row.column() col.label(text="") - if part.render_type in {'OBJECT', 'GROUP'} and not part.use_advanced_hair: + if part.type == 'EMITTER' or \ + (part.render_type in {'OBJECT', 'GROUP'} and part.type == 'HAIR' and not part.use_advanced_hair): row = layout.row(align=True) row.prop(part, "particle_size") row.prop(part, "size_random", slider=True) |