diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-21 02:08:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-21 02:08:24 +0400 |
| commit | 1fef05084e674e4e41388f63b95a2c71aec20a16 (patch) | |
| tree | af2ac86bdefeea596b5474c05ef94788e5fd683d /source/blender/editors/object/object_modifier.c | |
| parent | deb3b7e282c9fed045201ca39d682baf3a281ffe (diff) | |
| parent | 2d1de2e78d619ffd999876768a9466d083984a9f (diff) | |
svn merge ^/trunk/blender -r42761:42776
Diffstat (limited to 'source/blender/editors/object/object_modifier.c')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index ec96bde13a0..a140888a602 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -464,7 +464,7 @@ static int modifier_apply_shape(ReportList *reports, Scene *scene, Object *ob, M Key *key=me->key; KeyBlock *kb; - if(!modifier_sameTopology(md)) { + if(!modifier_sameTopology(md) || mti->type == eModifierTypeType_NonGeometrical) { BKE_report(reports, RPT_ERROR, "Only deforming modifiers can be applied to Shapes"); return 0; } @@ -512,7 +512,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, Mesh *me = ob->data; MultiresModifierData *mmd= find_multires_modifier_before(scene, md); - if( me->key) { + if(me->key && mti->type != eModifierTypeType_NonGeometrical) { BKE_report(reports, RPT_ERROR, "Modifier cannot be applied to Mesh with Shape Keys"); return 0; } |