Merge branch 'master' into tmp-volume-matrix-api-update

Try to fix MSVC
Fix namespace ambiguity confusing MSVC
2023-02-06 21:21:01 +01:00 · 2023-02-06 14:00:47 +01:00 · 2023-02-06 12:25:20 +01:00 · 2023-02-06 12:20:00 +01:00 · 2023-02-02 14:33:56 +01:00 · 2023-02-01 19:54:18 +01:00
3 changed files with 5 additions and 4 deletions
--- a/source/blender/blenlib/BLI_any.hh
+++ b/source/blender/blenlib/BLI_any.hh
@@ -98,8 +98,8 @@ class Any {
 private:
  /* Makes it possible to use void in the template parameters. */
  using RealExtraInfo =
-      std::conditional_t<std::is_void_v<ExtraInfo>, detail::NoExtraInfo, ExtraInfo>;
-  using Info = detail::AnyTypeInfo<RealExtraInfo>;
+      std::conditional_t<std::is_void_v<ExtraInfo>, blender::detail::NoExtraInfo, ExtraInfo>;
+  using Info = blender::detail::AnyTypeInfo<RealExtraInfo>;
  static constexpr size_t RealInlineBufferCapacity = std::max(InlineBufferCapacity,
                                                              sizeof(std::unique_ptr<int>));

--- a/source/blender/blenlib/BLI_math_matrix.hh
+++ b/source/blender/blenlib/BLI_math_matrix.hh
@@ -491,7 +491,8 @@ template<typename T, int Size>
 [[nodiscard]] MatBase<T, Size, Size> invert(const MatBase<T, Size, Size> &mat)
 {
  bool success;
-  return invert(mat, success);
+  /* Explicit template parameter to please MSVC. */
+  return invert<T, Size>(mat, success);
 }

 template<typename T, int NumCol, int NumRow>
--- a/source/blender/blenlib/BLI_virtual_array.hh
+++ b/source/blender/blenlib/BLI_virtual_array.hh
@@ -527,7 +527,7 @@ template<typename T> class VArrayCommon {
   * Other virtual array implementations are typically stored as #std::shared_ptr. That works even
   * when the implementation itself is not copyable and makes copying #VArrayCommon cheaper.
   */
-  using Storage = Any<detail::VArrayAnyExtraInfo<T>, 24, 8>;
+  using Storage = Any<blender::detail::VArrayAnyExtraInfo<T>, 24, 8>;

  /**
   * Pointer to the currently contained virtual array implementation. This is allowed to be null.
Author	SHA1	Message	Date
Clément Foucault	ca820c3ebd	Merge branch 'master' into tmp-volume-matrix-api-update	2023-02-06 21:21:01 +01:00
Clément Foucault	ab223d1f8e	Try to fix MSVC	2023-02-06 14:00:47 +01:00
Clément Foucault	b8866eeeb3	Fix namespace ambiguity confusing MSVC	2023-02-06 12:25:20 +01:00
Clément Foucault	616ff437ea	Merge branch 'master'	2023-02-06 12:20:00 +01:00
Clément Foucault	b2c869f6a9	Fix copy paste error	2023-02-02 14:33:56 +01:00
Clément Foucault	54ece291d3	Remove old headers	2023-02-01 19:54:18 +01:00
Clément Foucault	b6db27fe24	Fix regression	2023-02-01 19:47:58 +01:00
Clément Foucault	fbfa83caba	Fix UB	2023-02-01 18:23:26 +01:00
Clément Foucault	32c173be45	Fix alignment error causing crash	2023-02-01 18:23:12 +01:00
Clément Foucault	77c550cc43	Fix compilation of usd writer	2023-02-01 17:25:41 +01:00
Clément Foucault	6b7d893107	BLI: Use BLI_math_matrix_type.hh instead of BLI_math_float4x4.hh Straightforward port. I took the oportunity to remove some C vector functions (ex: copy_v2_v2()).	2023-02-01 16:46:43 +01:00