svn merge -r37030:37035 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / modifiers / intern / MOD_boolean.c
index 4b4d0124aae1ca8fd8bab9aae4e6b9b2c36a0380..f8a9fdcfbb1a44a1d0060d67ca0af06f0b341250 100644 (file)
@@ -99,12 +99,12 @@ static DerivedMesh *get_quick_derivedMesh(DerivedMesh *derivedData, DerivedMesh
        if(derivedData->getNumFaces(derivedData) == 0 || dm->getNumFaces(dm) == 0) {
                switch(operation) {
                        case eBooleanModifierOp_Intersect:
-                               result = CDDM_new(0, 0, 0);
+                               result = CDDM_new(0, 0, 0, 0, 0);
                                break;
 
                        case eBooleanModifierOp_Union:
                                if(derivedData->getNumFaces(derivedData)) result = derivedData;
-                               else result = CDDM_copy(dm);
+                               else result = CDDM_copy(dm, FALSE);
 
                                break;