diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-19 19:08:14 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-19 19:08:14 +0300 |
| commit | af170839afc6334bb3ce9ea62624c6c103707dc6 (patch) | |
| tree | f3536c500ad8982ce9d49dcd8014ce37904575a3 /source/blender/modifiers/intern/MOD_boolean.c | |
| parent | 2cdc2f2a2542f31c1c11a9913830f0ff7846888a (diff) | |
| parent | b31faac17eaf66e034107f136bb00dd16361a0bf (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index ce1fc525531..5811017f745 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -57,6 +57,7 @@ #include "BLI_alloca.h" #include "BLI_math_geom.h" #include "BKE_material.h" +#include "BKE_global.h" /* only to check G.debug */ #include "MEM_guardedalloc.h" #include "bmesh.h" @@ -304,11 +305,17 @@ static DerivedMesh *applyModifier_bmesh( * currently this is ok for 'BM_mesh_intersect' */ // BM_mesh_normals_update(bm); - /* change for testing */ bool use_separate = false; bool use_dissolve = true; bool use_island_connect = true; + /* change for testing */ + if (G.debug & G_DEBUG) { + use_separate = (bmd->bm_flag & eBooleanModifierBMeshFlag_BMesh_Separate) != 0; + use_dissolve = (bmd->bm_flag & eBooleanModifierBMeshFlag_BMesh_NoDissolve) == 0; + use_island_connect = (bmd->bm_flag & eBooleanModifierBMeshFlag_BMesh_NoConnectRegions) == 0; + } + BM_mesh_intersect( bm, looptris, tottri, |