diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:06:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:06:23 +0300 |
| commit | 5376c739f5bf4029e0a32946e9945a732feba217 (patch) | |
| tree | b3494e69541d22edf5b971106b532e3a2a2577cd /release | |
| parent | 98dcd33238e44984d31d96e2ffd0191a5d1cf7b6 (diff) | |
| parent | 486e2547eea3f12bfde70f2526dde08f39a8722b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index d52705bce6e..4932f3467c5 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -1085,7 +1085,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): col.label(text="") if part.type == 'EMITTER' or \ - (part.render_type in {'OBJECT', 'GROUP'} and part.type == 'HAIR' and not part.use_advanced_hair): + (part.render_type in {'OBJECT', 'GROUP'} and part.type == 'HAIR'): row = layout.row(align=True) row.prop(part, "particle_size") row.prop(part, "size_random", slider=True) |