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 /source/blender/blenkernel/intern/particle.c | |
| 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 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index a819b73ca3c..a76b60fa93a 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3652,6 +3652,7 @@ static void default_particle_settings(ParticleSettings *part) if (!part->effector_weights) part->effector_weights = BKE_add_effector_weights(NULL); + part->omat = 1; part->use_modifier_stack = false; } |