svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_l...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 1 Feb 2012 09:31:13 +0000 (09:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 1 Feb 2012 09:31:13 +0000 (09:31 +0000)
1  2 
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/constraint.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_modifier.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_conversions.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_curve.c

index 6014413bd00687295bc0c6d2616b407361345498,2493b5e0f747962daa6557c6ac794dd6b4f6ad89..72e5475449803bb3dcb2fa9dba0bf9183c9c7bd7
@@@ -136,12 -138,12 +138,16 @@@ static DerivedMesh *applyModifier(Modif
                result = get_quick_derivedMesh(derivedData, dm, bmd->operation);
  
                if(result == NULL) {
 +
 +                      DM_ensure_tessface(dm);          /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
 +                      DM_ensure_tessface(derivedData); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */
 +
+                       // TIMEIT_START(NewBooleanDerivedMesh)
                        result = NewBooleanDerivedMesh(dm, bmd->object, derivedData, ob,
                                        1 + bmd->operation);
+                       // TIMEIT_END(NewBooleanDerivedMesh)
                }
  
                /* if new mesh returned, return it; otherwise there was