From a6c69ca57f661a8538d70cde9471a2554cecc65b Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Fri, 29 Dec 2017 13:03:26 -0200 Subject: Fix T53513: Particle size showing in multiple places Technically this was introduced in 01b547f9931970050e when exposing size and randomness for particles. This "fixes" makes sure particle size and size randomness is always in the Render panel when it affects the particle system (i.e., always unless using advanced hair or hair that is not rendering groups/objects). --- release/scripts/startup/bl_ui/properties_particle.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'release/scripts') diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 0352c4e6e09..5c16a38a897 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") @@ -1089,7 +1085,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) -- cgit v1.2.3