svn merge -r 12208:12294 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / blenkernel / intern / modifier.c
index c1f097e84470d2a7f556dd34500621b1ab0b0fc7..bb6297361fe67d690d2b5b53c82832e206281995 100644 (file)
@@ -5000,7 +5000,7 @@ static DerivedMesh *booleanModifier_applyModifier(
        /* we do a quick sanity check */
        if(((Mesh *)ob->data)->totface > 3
           && bmd->object && ((Mesh *)bmd->object->data)->totface > 3) {
-               DerivedMesh *result = NewBooleanDerivedMesh(ob, bmd->object,
+               DerivedMesh *result = NewBooleanDerivedMesh(bmd->object, ob,
                                                            1 + bmd->operation);
 
                /* if new mesh returned, return it; otherwise there was