Commit 55ca0409 authored by Billy Cao's avatar Billy Cao
Browse files

Resolve conflict

parent b11713ec
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -422,14 +422,14 @@ def process_images(p: StableDiffusionProcessing) -> Processed:


    try:
    try:
        for k, v in p.override_settings.items():
        for k, v in p.override_settings.items():
            opts.data[k] = v  # we don't call onchange for simplicity which makes changing model impossible
            setattr(opts, k, v)  # we don't call onchange for simplicity which makes changing model impossible
            if k == 'sd_hypernetwork': shared.reload_hypernetworks()  # make onchange call for changing hypernet since it is relatively fast to load on-change, while SD models are not
            if k == 'sd_hypernetwork': shared.reload_hypernetworks()  # make onchange call for changing hypernet since it is relatively fast to load on-change, while SD models are not


        res = process_images_inner(p)
        res = process_images_inner(p)


    finally:  # restore opts to original state
    finally:  # restore opts to original state
        for k, v in stored_opts.items():
        for k, v in stored_opts.items():
            opts.data[k] = v
            setattr(opts, k, v)
            if k == 'sd_hypernetwork': shared.reload_hypernetworks()
            if k == 'sd_hypernetwork': shared.reload_hypernetworks()


    return res
    return res