Merge branch 'feature/add-inpaint-mask-generation' of https://github.com/mashb1t/Fooocus into feature/add-inpaint-mask-generation

# Conflicts:
#	language/en.json
#	launch.py
This commit is contained in:
Manuel Schmid 2024-03-03 14:56:19 +01:00
commit 1a82c5559c
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
2 changed files with 11 additions and 2 deletions

View File

@ -36,6 +36,15 @@
"Top": "Top",
"Bottom": "Bottom",
"* \"Inpaint or Outpaint\" is powered by the sampler \"DPMPP Fooocus Seamless 2M SDE Karras Inpaint Sampler\" (beta)": "* \"Inpaint or Outpaint\" is powered by the sampler \"DPMPP Fooocus Seamless 2M SDE Karras Inpaint Sampler\" (beta)",
"Mask generation model": "Mask generation model",
"Cloth category": "Cloth category",
"Segmentation prompt": "Segmentation prompt",
"Advanced options": "Advanced options",
"SAM model": "SAM model",
"Quantization": "Quantization",
"Box Threshold": "Box Threshold",
"Text Threshold": "Text Threshold",
"Generate mask from image": "Generate mask from image",
"Setting": "Setting",
"Style": "Style",
"Performance": "Performance",

View File

@ -22,9 +22,9 @@ import fooocus_version
from build_launcher import build_launcher
from modules.launch_util import is_installed, run, python, run_pip, requirements_met
from modules.model_loader import load_file_from_url
from modules.config import path_inpaint
from modules import config
os.environ["U2NET_HOME"] = path_inpaint
os.environ["U2NET_HOME"] = config.path_inpaint
REINSTALL_ALL = False
TRY_INSTALL_XFORMERS = False