svn merge -r37030:37035 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 06:39:57 +0000 (06:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 06:39:57 +0000 (06:39 +0000)
1  2 
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nla.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_boolean.c

index 4b4d0124aae1ca8fd8bab9aae4e6b9b2c36a0380,4b4d0124aae1ca8fd8bab9aae4e6b9b2c36a0380..f8a9fdcfbb1a44a1d0060d67ca0af06f0b341250
@@@ -99,12 -99,12 +99,12 @@@ static DerivedMesh *get_quick_derivedMe
        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;