Skip to content

Commit f48f2f8

Browse files
committed
Merge branch 'master' into vae-fallback-cpu
2 parents c8bbd92 + 0d45a56 commit f48f2f8

File tree

18 files changed

+471
-370
lines changed

18 files changed

+471
-370
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Workflow examples can be found on the [Examples page](https://comfyanonymous.git
4646
| Ctrl + S | Save workflow |
4747
| Ctrl + O | Load workflow |
4848
| Ctrl + A | Select all nodes |
49+
| Alt + C | Collapse/uncollapse selected nodes |
4950
| Ctrl + M | Mute/unmute selected nodes |
5051
| Ctrl + B | Bypass selected nodes (acts like the node was removed from the graph and the wires reconnected through) |
5152
| Delete/Backspace | Delete selected nodes |

comfy/diffusers_load.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def load_diffusers(model_path, output_vae=True, output_clip=True, embedding_dire
3131

3232
vae = None
3333
if output_vae:
34-
vae = comfy.sd.VAE(ckpt_path=vae_path)
34+
sd = comfy.utils.load_torch_file(vae_path)
35+
vae = comfy.sd.VAE(sd=sd)
3536

3637
return (unet, clip, vae)

0 commit comments

Comments
 (0)