Merge remote-tracking branch 'upstream/master' into ModelLoader

This commit is contained in:
d8ahazard
2022-09-27 11:02:41 -05:00
13 changed files with 258 additions and 34 deletions

View File

@@ -85,7 +85,8 @@ def webui():
txt2img=wrap_gradio_gpu_call(modules.txt2img.txt2img),
img2img=wrap_gradio_gpu_call(modules.img2img.img2img),
run_extras=wrap_gradio_gpu_call(modules.extras.run_extras),
run_pnginfo=modules.extras.run_pnginfo
run_pnginfo=modules.extras.run_pnginfo,
run_modelmerger=modules.extras.run_modelmerger
)
demo.launch(