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

[Howard Trickey]

Commit: a2dbeb458c19d757ace5bf5c78fbf683dd73dab4
Author: Howard Trickey
Date:   Sun Jul 26 06:47:46 2020 -0400
Branches: newboolean
https://developer.blender.org/rBa2dbeb458c19d757ace5bf5c78fbf683dd73dab4

Merge branch 'master' into newboolean

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



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

diff --cc tests/gtests/blenlib/CMakeLists.txt
index 64df58bff1d,0727d317eaa..09996f3ef14
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@@ -43,13 -39,9 +43,10 @@@ else(
    set(BLI_path_util_extra_libs "bf_blenlib;extern_wcwidth;${ZLIB_LIBRARIES}")
  endif()
  
- BLENDER_TEST(BLI_array "bf_blenlib")
  BLENDER_TEST(BLI_array_store "bf_blenlib")
  BLENDER_TEST(BLI_array_utils "bf_blenlib")
 +BLENDER_TEST(BLI_boolean "bf_blenlib")
  BLENDER_TEST(BLI_delaunay_2d "bf_blenlib")
- BLENDER_TEST(BLI_disjoint_set "bf_blenlib")
- BLENDER_TEST(BLI_edgehash "bf_blenlib")
  BLENDER_TEST(BLI_expr_pylike_eval "bf_blenlib")
  BLENDER_TEST(BLI_ghash "bf_blenlib")
  BLENDER_TEST(BLI_hash_mm2a "bf_blenlib")
@@@ -70,16 -57,10 +62,11 @@@ BLENDER_TEST(BLI_math_geom "bf_blenlib"
  BLENDER_TEST(BLI_math_matrix "bf_blenlib")
  BLENDER_TEST(BLI_math_vector "bf_blenlib")
  BLENDER_TEST(BLI_memiter "bf_blenlib")
- BLENDER_TEST(BLI_memory_utils "bf_blenlib")
 +BLENDER_TEST(BLI_mesh_intersect "bf_blenlib")
  BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
  BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
- BLENDER_TEST(BLI_set "bf_blenlib")
- BLENDER_TEST(BLI_span "bf_blenlib")
  BLENDER_TEST(BLI_stack "bf_blenlib")
- BLENDER_TEST(BLI_stack_cxx "bf_blenlib")
  BLENDER_TEST(BLI_string "bf_blenlib")
- BLENDER_TEST(BLI_string_ref "bf_blenlib")
  BLENDER_TEST(BLI_string_utf8 "bf_blenlib")
  BLENDER_TEST(BLI_task "bf_blenlib;bf_intern_numaapi")
  BLENDER_TEST(BLI_task_graph "bf_blenlib;bf_intern_numaapi")