diff options
author | Geoffroy Krantz <kgeogeo@hotmail.com> | 2013-12-07 04:51:44 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-07 15:26:58 +0400 |
commit | 9174f22b3c51b601e6c399bba2b32303f008630d (patch) | |
tree | c83995440d0b54f1a5dcddf475cbc92f8c0545a0 /release | |
parent | 85a0c5d4e1030a5fa95ad7450958a1b0fa033381 (diff) |
Particles: change material picking from index number in UI to menu with materials.
Also fix material slot index not being properly initialized to 1, this got clamped
from zero only on drawing the UI.
Reviewed By: brecht
Differential Revision: http://developer.blender.org/D55
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 c5997ebd514..206a208eac3 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -797,7 +797,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): part = particle_get_settings(context) row = layout.row() - row.prop(part, "material") + row.prop(part, "material_slot", text="") if psys: row.prop(psys, "parent") |