mirror of
https://github.com/sd-webui/stable-diffusion-webui.git
synced 2024-12-15 07:12:58 +03:00
Merge branch 'sd-webui:dev' into dev
This commit is contained in:
commit
cf924ca11f
@ -7,6 +7,7 @@
|
||||
|
||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||
cd $SCRIPT_DIR
|
||||
export PYTHONPATH=$SCRIPT_DIR
|
||||
|
||||
MODEL_DIR="${SCRIPT_DIR}/model_cache"
|
||||
# Array of model files to pre-download
|
||||
@ -31,6 +32,7 @@ ENV_UPDATED=0
|
||||
ENV_MODIFIED=$(date -r $ENV_FILE "+%s")
|
||||
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
|
||||
export PIP_EXISTS_ACTION=w
|
||||
|
||||
# Create/update conda env if needed
|
||||
if ! conda env list | grep ".*${ENV_NAME}.*" >/dev/null 2>&1; then
|
||||
|
@ -2306,7 +2306,7 @@ img2img_toggles = [
|
||||
'Write sample info files',
|
||||
'Write sample info to one file',
|
||||
'jpg samples',
|
||||
'Color correction (always enabled on loopback mode)'
|
||||
'Color correction (always enabled on loopback mode)',
|
||||
'Filter NSFW content',
|
||||
]
|
||||
# removed for now becuase of Image Lab implementation
|
||||
|
Loading…
Reference in New Issue
Block a user