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/object/object_modifier.c | |
| parent | 87a34772003413bd402ea380ce5d8d7c3f3a6337 (diff) | |
| parent | ac498a6b64ea2f034aa0177894fb25d0401e327b (diff) | |
svn merge ^/trunk/blender -r42778:42839
Diffstat (limited to 'source/blender/editors/object/object_modifier.c')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index a140888a602..c5de274c464 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -655,7 +655,7 @@ static int modifier_add_exec(bContext *C, wmOperator *op) static EnumPropertyItem *modifier_add_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free) { Object *ob= ED_object_active_context(C); - EnumPropertyItem *item= NULL, *md_item; + EnumPropertyItem *item= NULL, *md_item, *group_item= NULL; ModifierTypeInfo *mti; int totitem= 0, a; @@ -675,6 +675,17 @@ static EnumPropertyItem *modifier_add_itemf(bContext *C, PointerRNA *UNUSED(ptr) (ob->type==OB_MESH && (mti->flags & eModifierTypeFlag_AcceptsMesh)))) continue; } + else { + group_item= md_item; + md_item= NULL; + + continue; + } + + if(group_item) { + RNA_enum_item_add(&item, &totitem, group_item); + group_item= NULL; + } RNA_enum_item_add(&item, &totitem, md_item); } |