svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_l...
[blender-staging.git] / source / blender / editors / object / object_modifier.c
index d6ef894b2c7a0f4c9c213ca89e38ec9292bf7975..aef8aa4293198a2ced79e4a707b5e868fd8ed9c6 100644 (file)
@@ -548,7 +548,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
                int numVerts;
                float (*vertexCos)[3];
 
-               if (mti->type==eModifierTypeType_Constructive) {
+               if (ELEM(mti->type, eModifierTypeType_Constructive, eModifierTypeType_Nonconstructive)) {
                        BKE_report(reports, RPT_ERROR, "Cannot apply constructive modifiers on curve");
                        return 0;
                }