[Bf-blender-cvs] [19868fcdefc] temp-T97352-3d-texturing-seam-bleeding-b2: Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding-b2

[Jeroen Bakker]

Commit: 19868fcdefc21ef929f708fd89c4f42ece36c895
Author: Jeroen Bakker
Date:   Mon Sep 26 13:27:28 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rB19868fcdefc21ef929f708fd89c4f42ece36c895

Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding-b2

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



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

diff --cc source/blender/blenlib/BLI_vector.hh
index d2f8a67d5c4,cba58945546..6bc785c322a
--- a/source/blender/blenlib/BLI_vector.hh
+++ b/source/blender/blenlib/BLI_vector.hh
@@@ -905,14 -915,9 +915,14 @@@ class Vector 
     */
    int64_t capacity() const
    {
-     return static_cast<int64_t>(capacity_end_ - begin_);
+     return int64_t(capacity_end_ - begin_);
    }
  
 +  bool is_at_capacity() const
 +  {
 +    return end_ == capacity_end_;
 +  }
 +
    /**
     * Get an index range that makes looping over all indices more convenient and less error prone.
     * Obviously, this should only be used when you actually need the index in the loop.
diff --cc source/blender/blenlib/CMakeLists.txt
index cc3b3730f4a,e0d05f8c36a..dea53d1aa9a
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@@ -332,8 -333,6 +333,7 @@@ set(SR
    BLI_uuid.h
    BLI_uvproject.h
    BLI_vector.hh
-   BLI_vector_adaptor.hh
 +  BLI_vector_list.hh
    BLI_vector_set.hh
    BLI_vector_set_slots.hh
    BLI_virtual_array.hh