Merge branch 'master' into fs3

Author: torzdf

.install/linux/faceswap_setup_x64.sh

@@ -380,7 +380,9 @@ activate_env() {
 install_git() {
     # Install git inside conda environment
     info "Installing Git..."
-    yellow ; conda install git -q -y
+    # TODO On linux version 2.45.2 makes the font fixed TK pull in Python from
+    # graalpy, which breaks pretty much everything
+    yellow ; conda install "git<2.45" -q -y
 }
 
 delete_faceswap() {

lib/align/alignments.py

@@ -407,8 +407,8 @@ def mask_is_valid(self, mask_type: str) -> bool:
             ``True`` if all faces in the current alignments possess the given ``mask_type``
             otherwise ``False``
         """
-        retval = any((face.get("mask", None) is not None and
-                      face["mask"].get(mask_type, None) is not None)
+        retval = all((face.get("mask") is not None and
+                      face["mask"].get(mask_type) is not None)
                      for val in self._data.values()
                      for face in val["faces"])
         logger.debug(retval)

requirements/_requirements_base.txt

@@ -1,7 +1,7 @@
 tqdm>=4.66
 psutil>=5.9.0
 numexpr>=2.8.7
-numpy>=1.26.4,<2.0.0
+numpy>=1.26.0,<2.0.0
 opencv-python>=4.9.0.0
 pillow>=10.3.0
 scikit-learn>=1.4.2