sd-webui/stable-diffusion-webui
1
1
Fork 0
mirror of https://github.com/sd-webui/stable-diffusion-webui.git synced 2024-12-14 23:02:00 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'sd-webui:dev' into dev

Browse Source
This commit is contained in:
ZeroCool 2022-09-11 10:43:01 -07:00 committed by GitHub
commit cf924ca11f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entrypoint.sh
View File

@ -7,6 +7,7 @@
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
cd $SCRIPT_DIR cd $SCRIPT_DIR
export PYTHONPATH=$SCRIPT_DIR
MODEL_DIR="${SCRIPT_DIR}/model_cache" MODEL_DIR="${SCRIPT_DIR}/model_cache"
# Array of model files to pre-download # Array of model files to pre-download
@ -31,6 +32,7 @@ ENV_UPDATED=0
ENV_MODIFIED=$(date -r $ENV_FILE "+%s") ENV_MODIFIED=$(date -r $ENV_FILE "+%s")
ENV_MODIFED_FILE="${SCRIPT_DIR}/.env_updated" ENV_MODIFED_FILE="${SCRIPT_DIR}/.env_updated"
if [[ -f $ENV_MODIFED_FILE ]]; then ENV_MODIFIED_CACHED=$(<${ENV_MODIFED_FILE}); else ENV_MODIFIED_CACHED=0; fi if [[ -f $ENV_MODIFED_FILE ]]; then ENV_MODIFIED_CACHED=$(<${ENV_MODIFED_FILE}); else ENV_MODIFIED_CACHED=0; fi
export PIP_EXISTS_ACTION=w
# Create/update conda env if needed # Create/update conda env if needed
if ! conda env list | grep ".*${ENV_NAME}.*" >/dev/null 2>&1; then if ! conda env list | grep ".*${ENV_NAME}.*" >/dev/null 2>&1; then

2
scripts/webui.py
View File

@ -2306,7 +2306,7 @@ img2img_toggles = [
'Write sample info files', 'Write sample info files',
'Write sample info to one file', 'Write sample info to one file',
'jpg samples', 'jpg samples',
'Color correction (always enabled on loopback mode)' 'Color correction (always enabled on loopback mode)',
'Filter NSFW content', 'Filter NSFW content',
] ]
# removed for now becuase of Image Lab implementation # removed for now becuase of Image Lab implementation