diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
| commit | 4aa82806effa9e114f14f88d7b2da23b0a2bcca6 (patch) | |
| tree | 6741012808ab0c83f96ff7e52c8168cb62b8c8b7 /source/blender/modifiers/intern/MOD_boolean.c | |
| parent | 35678eaae52a8436469b06307eaaf4d8503863f1 (diff) | |
| parent | ed0d2b5e9205fc99ed38957f01acaa62c3811333 (diff) | |
svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 6014413bd00..72e54754498 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -47,6 +47,8 @@ #include "MOD_boolean_util.h" #include "MOD_util.h" +#include "PIL_time.h" + static void copyData(ModifierData *md, ModifierData *target) { BooleanModifierData *bmd = (BooleanModifierData*) md; @@ -140,8 +142,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, 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 |