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

[Howard Trickey]

Commit: d7b3d0aa272948d268731a530ceb67c4bc40a44d
Author: Howard Trickey
Date:   Thu Jun 11 05:44:10 2020 -0400
Branches: newboolean
https://developer.blender.org/rBd7b3d0aa272948d268731a530ceb67c4bc40a44d

Merge branch 'master' into newboolean

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



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

diff --cc source/blender/blenlib/BLI_float2.hh
index 2bb5cf82214,94da5d18ad2..f6c87a3555f
--- a/source/blender/blenlib/BLI_float2.hh
+++ b/source/blender/blenlib/BLI_float2.hh
@@@ -89,44 -79,8 +89,44 @@@ struct float2 
      stream << "(" << v.x << ", " << v.y << ")";
      return stream;
    }
 +
 +  static float dot(const float2 &a, const float2 &b)
 +  {
 +    return a.x * b.x + a.y * b.y;
 +  }
 +
 +  static float2 interpolate(const float2 &a, const float2 &b, float t)
 +  {
 +    return a * (1 - t) + b * t;
 +  }
 +
 +  static float distance(const float2 &a, const float2 &b)
 +  {
 +    return (a - b).length();
 +  }
 +
 +  static float distance_squared(const float2 &a, const float2 &b)
 +  {
 +    return float2::dot(a, b);
 +  }
 +
 +  struct isect_result {
 +    enum {
 +      LINE_LINE_COLINEAR = -1,
 +      LINE_LINE_NONE = 0,
 +      LINE_LINE_EXACT = 1,
 +      LINE_LINE_CROSS = 2,
 +    } kind;
 +    float lambda;
 +    float mu;
 +  };
 +
 +  static isect_result isect_seg_seg(const float2 &v1,
 +                                    const float2 &v2,
 +                                    const float2 &v3,
 +                                    const float2 &v4);
  };
  
- }  // namespace BLI
+ }  // namespace blender
  
  #endif /* __BLI_FLOAT2_HH__ */
diff --cc source/blender/blenlib/CMakeLists.txt
index f09291ecf03,69df0505dfe..b754e7b16a8
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@@ -230,11 -224,7 +232,10 @@@ set(SR
    BLI_memory_utils.h
    BLI_memory_utils.hh
    BLI_mempool.h
 +  BLI_mesh_intersect.hh
 +  BLI_mpq2.hh
 +  BLI_mpq3.hh
    BLI_noise.h
-   BLI_open_addressing.hh
    BLI_optional.hh
    BLI_path_util.h
    BLI_polyfill_2d.h
diff --cc tests/gtests/blenlib/CMakeLists.txt
index 89a62f41f71,8ddb2702b83..6c19854df96
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@@ -44,10 -40,8 +44,9 @@@ else(
  endif()
  
  BLENDER_TEST(BLI_array "bf_blenlib")
- BLENDER_TEST(BLI_array_ref "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_edgehash "bf_blenlib")
  BLENDER_TEST(BLI_expr_pylike_eval "bf_blenlib")