[Bf-blender-cvs] [9c6c299c7fd] newboolean: Merge branch 'master' into newboolean

[Howard Trickey]

Commit: 9c6c299c7fd1965035e48c4770bfabdc53eb3b4a
Author: Howard Trickey
Date:   Tue Jan 28 12:20:20 2020 -0500
Branches: newboolean
https://developer.blender.org/rB9c6c299c7fd1965035e48c4770bfabdc53eb3b4a

Merge branch 'master' into newboolean

===================================================================



===================================================================

diff --cc source/blender/editors/mesh/editmesh_intersect.c
index 0a01f9be3e5,847a8ecacc3..92192a2089e
--- a/source/blender/editors/mesh/editmesh_intersect.c
+++ b/source/blender/editors/mesh/editmesh_intersect.c
@@@ -219,11 -211,8 +219,11 @@@ static int edbm_intersect_exec(bContex
        BM_mesh_separate_faces(
            em->bm, BM_elem_cb_check_hflag_enabled_simple(const BMFace *, BM_ELEM_SELECT));
      }
 +    else if (newbool && use_separate_all) {
 +      BM_mesh_edgesplit(em->bm, false, true, false);
 +    }
  
-     edbm_intersect_select(em, has_isect);
+     edbm_intersect_select(em, obedit->data, has_isect);
  
      if (!has_isect) {
        isect_len++;
@@@ -317,26 -304,21 +317,26 @@@ static int edbm_intersect_boolean_exec(
        continue;
      }
  
 -    has_isect = BM_mesh_intersect(em->bm,
 -                                  em->looptris,
 -                                  em->tottri,
 -                                  test_fn,
 -                                  NULL,
 -                                  false,
 -                                  false,
 -                                  true,
 -                                  true,
 -                                  false,
 -                                  true,
 -                                  boolean_operation,
 -                                  eps);
 +    if (newbool) {
 +      has_isect = BM_mesh_boolean(em->bm, test_fn, NULL, false, false, boolean_operation, eps);
 +    }
 +    else {
 +      has_isect = BM_mesh_intersect(em->bm,
 +                                    em->looptris,
 +                                    em->tottri,
 +                                    test_fn,
 +                                    NULL,
 +                                    false,
 +                                    false,
 +                                    true,
 +                                    true,
 +                                    false,
 +                                    true,
 +                                    boolean_operation,
 +                                    eps);
 +    }
  
-     edbm_intersect_select(em, has_isect);
+     edbm_intersect_select(em, obedit->data, has_isect);
  
      if (!has_isect) {
        isect_len++;