svn merge ^/trunk/blender -r43639:43664
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 16:18:20 +0000 (16:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 16:18:20 +0000 (16:18 +0000)
1  2 
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_boolean_util.c

index 038e48f5769506ae29b59a9be8904b656e7924de,424f97f57ed53c40a4c12b456aa3c158f139f1c6..cd2d4c0c1f8488ec64c0d1d122ecfe7a806fbf71
@@@ -1343,7 -1354,8 +1354,8 @@@ void smokeModifier_do(SmokeModifierDat
                        if(smd->coll->dm)
                                smd->coll->dm->release(smd->coll->dm);
  
 -                      smd->coll->dm = CDDM_copy(dm);
 +                      smd->coll->dm = CDDM_copy(dm, 1);
+ #endif
  
                        // rigid movement support
                        copy_m4_m4(smd->coll->mat_old, smd->coll->mat);
index 4c17ee54fd2a70c0662772286f9cc6cb8be41bca,f6a2e4451b2ce0dafb4d09989c1b1b4e35e52e5b..345cba5d3d1e49aece24be702026e7852e06d9c7
@@@ -350,10 -350,10 +350,10 @@@ static DerivedMesh *ConvertCSGDescripto
        GHash *material_hash = NULL;
        Mesh *me1= (Mesh*)ob1->data;
        Mesh *me2= (Mesh*)ob2->data;
-       int i;
+       int i, *origindex_layer;
  
        // create a new DerivedMesh
 -      result = CDDM_new(vertex_it->num_elements, 0, face_it->num_elements);
 +      result = CDDM_new(vertex_it->num_elements, 0, face_it->num_elements, 0, 0);
        CustomData_merge(&dm1->faceData, &result->faceData, CD_MASK_DERIVEDMESH,
                                          CD_DEFAULT, face_it->num_elements); 
        CustomData_merge(&dm2->faceData, &result->faceData, CD_MASK_DERIVEDMESH,