svn merge -r37030:37035 https://svn.blender.org/svnroot/bf-blender/trunk/blender

diff --cc source/blender/makesrna/intern/rna_main_api.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_modifier.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_nla.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_object.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_boolean.c
index 4b4d0124aae1ca8fd8bab9aae4e6b9b2c36a0380,4b4d0124aae1ca8fd8bab9aae4e6b9b2c36a0380..f8a9fdcfbb1a44a1d0060d67ca0af06f0b341250
--- 1/source/blender/modifiers/intern/MOD_boolean.c
--- 2/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@@ -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;