diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-29 19:50:37 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-29 19:50:37 +0400 |
| commit | 289c5de7d8c8f346832cb55754fb82e11f8377a4 (patch) | |
| tree | 13e687e584ca056c6f6137fc5bfdf9d2775d9bb6 /release | |
| parent | 299180f3c6433bb215053a8ef5ec3cbd1d1e4bbe (diff) | |
Fix T38359: incorrect display of material slot with pinned particle settings.
Just hide it in this case, the material slot is not really valid without an
object in the context.
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 01038c32293..30fc3a9e373 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -799,11 +799,11 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): psys = context.particle_system part = particle_get_settings(context) - row = layout.row() - if part.render_type in {'OBJECT', 'GROUP'}: - row.enabled = False - row.prop(part, "material_slot", text="") if psys: + row = layout.row() + if part.render_type in {'OBJECT', 'GROUP'}: + row.enabled = False + row.prop(part, "material_slot", text="") row.prop(psys, "parent") split = layout.split() |