real fix for booleans and face shading this time.
[blender.git] / source / blender / modifiers / intern / MOD_boolean_util.c
index 04a2caf0cf83dcdb03611f5fab04b28bf99b1c5d..65ab6666220972f2c02d62a5b57939e8813b8ccf 100644 (file)
@@ -354,9 +354,9 @@ static DerivedMesh *ConvertCSGDescriptorsToDerivedMesh(
 
        // create a new DerivedMesh
        result = CDDM_new(vertex_it->num_elements, 0, face_it->num_elements, 0, 0);
-       CustomData_merge(&dm1->faceData, &result->faceData, CD_MASK_DERIVEDMESH & ~CD_MASK_NORMAL,
+       CustomData_merge(&dm1->faceData, &result->faceData, CD_MASK_DERIVEDMESH & ~(CD_MASK_NORMAL | CD_MASK_POLYINDEX | CD_MASK_ORIGINDEX),
                                          CD_DEFAULT, face_it->num_elements); 
-       CustomData_merge(&dm2->faceData, &result->faceData, CD_MASK_DERIVEDMESH & ~CD_MASK_NORMAL,
+       CustomData_merge(&dm2->faceData, &result->faceData, CD_MASK_DERIVEDMESH & ~(CD_MASK_NORMAL | CD_MASK_POLYINDEX | CD_MASK_ORIGINDEX),
                                          CD_DEFAULT, face_it->num_elements); 
 
        // step through the vertex iterators: