diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 15:34:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-25 15:34:09 +0400 |
| commit | f0b0679fd2cf78a3d137aad0b5732a41c761e1f8 (patch) | |
| tree | f93236eea78b1378117c28d805e31af2f4738e58 /source/blender/editors/object/object_modifier.c | |
| parent | 9e134507a78a1bf467e6157b26a282cc67ce27dd (diff) | |
found some changes were missed from previous manual merge
Diffstat (limited to 'source/blender/editors/object/object_modifier.c')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 0619a93954a..d89856b4268 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -470,7 +470,12 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, DerivedMesh *dm; Mesh *me = ob->data; MultiresModifierData *mmd= find_multires_modifier_before(scene, md); - + + if( me->key) { + BKE_report(reports, RPT_ERROR, "Modifier cannot be applied to Mesh with Shape Keys"); + return 0; + } + mesh_pmv_off(me); /* Multires: ensure that recent sculpting is applied */ @@ -498,7 +503,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob, CustomData_free_layer_active(&me->ldata, CD_MDISPS, me->totloop); } } - } + } else if (ELEM(ob->type, OB_CURVE, OB_SURF)) { Curve *cu; int numVerts; |