diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-23 12:41:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-23 12:41:53 +0400 |
| commit | 4ced91da47ec1e95d71beef07b218fd0290ff68a (patch) | |
| tree | 5f96c6268e194dd4cabcbe33efdc2fd226652cab /source/blender/editors/space_view3d/view3d_header.c | |
| parent | 87a34772003413bd402ea380ce5d8d7c3f3a6337 (diff) | |
| parent | ac498a6b64ea2f034aa0177894fb25d0401e327b (diff) | |
svn merge ^/trunk/blender -r42778:42839
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_header.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 739e7f186fe..597adcf4193 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -277,7 +277,7 @@ static int modeselect_addmode(char *str, const char *title, int id, int icon) static char *view3d_modeselect_pup(Scene *scene) { Object *ob= OBACT; - static char string[256]; + static char string[512]; const char *title= IFACE_("Mode: %t"); char *str = string; @@ -317,7 +317,10 @@ static char *view3d_modeselect_pup(Scene *scene) str += modeselect_addmode(str, N_("Pose Mode"), OB_MODE_POSE, ICON_POSE_HLT); } - if (ob->particlesystem.first || modifiers_findByType(ob, eModifierType_Cloth) || modifiers_findByType(ob, eModifierType_Softbody)) { + if ( ob->particlesystem.first || + modifiers_findByType(ob, eModifierType_Cloth) || + modifiers_findByType(ob, eModifierType_Softbody)) + { str += modeselect_addmode(str, N_("Particle Mode"), OB_MODE_PARTICLE_EDIT, ICON_PARTICLEMODE); } (void)str; |