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

[Howard Trickey]

Commit: 04ba7e05e8d05d142f8faa7c7f71380994ed2036
Author: Howard Trickey
Date:   Fri Jul 31 08:49:42 2020 -0400
Branches: newboolean
https://developer.blender.org/rB04ba7e05e8d05d142f8faa7c7f71380994ed2036

Merge branch 'master' into newboolean

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



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

diff --cc tests/gtests/blenlib/CMakeLists.txt
index 09996f3ef14,bb0a5b63f71..94c0fe13b41
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@@ -62,9 -57,9 +62,10 @@@ 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_mesh_intersect "bf_blenlib")
  BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
  BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
+ BLENDER_TEST(BLI_session_uuid "bf_blenlib")
  BLENDER_TEST(BLI_stack "bf_blenlib")
  BLENDER_TEST(BLI_string "bf_blenlib")
  BLENDER_TEST(BLI_string_utf8 "bf_blenlib")