Commit Graph

879 Commits

Author SHA1 Message Date
ltdrdata
8c8bedbaf2
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-05-02 11:28:48 +09:00
comfyanonymous
9c335a553f LoKR support. 2023-05-01 18:18:23 -04:00
comfyanonymous
6e51c38506 Merge branch 'finish-styling' of https://github.com/EllangoK/ComfyUI 2023-05-01 16:11:31 -04:00
EllangoK
81bee39ca0 style everything
styles searchbox, should be actually everything
2023-05-01 15:57:10 -04:00
comfyanonymous
d3293c8339 Properly disable all progress bars when disable_pbar=True 2023-05-01 15:52:17 -04:00
comfyanonymous
cb3772bbfa Merge branch 'pbars' of https://github.com/BlenderNeko/ComfyUI 2023-05-01 14:08:33 -04:00
EllangoK
6aae1f497f style context menu
fix graphdialog background, and palette template
2023-05-01 13:16:19 -04:00
ltdrdata
2f943e6f23
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-05-01 11:53:41 +09:00
ltdrdata
025fcacf0e
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-05-01 08:39:54 +09:00
Dr.Lt.Data
06d8ffb71e make default img_paste_mode to 'selected'
refactor space -> tab
2023-05-01 08:39:05 +09:00
comfyanonymous
b04e16ef5a Make default workflow use an existing checkpoint if no SD1.5 checkpoint. 2023-04-30 18:19:03 -04:00
comfyanonymous
0aa667ed33 Fix ConditioningAverage. 2023-04-30 17:33:43 -04:00
FizzleDorf
29c8f1a344
Conditioning Average (#495)
* first commit

* fixed a bunch of things missing in initial commit.

* parameters renamed for clarity

* renamed node, attempted update cond list

* to_strength removed, it is now normalized

* removed comments and prints. Attempted to apply to every cond in list again but no luck

* fixed repeating frames after batch using deepcopy

* Revert "fixed repeating frames after batch using deepcopy"

This reverts commit 1086d6a0e1.

* Rewrite addWeighted to use torch.mul iteratively.

---------

Co-authored-by: City <125218114+city96@users.noreply.github.com>
2023-04-30 17:33:15 -04:00
comfyanonymous
2012362493 Adjust node resize area depending on outputs. 2023-04-30 13:02:07 -04:00
BlenderNeko
a2e18b1504 allow disabling of progress bar when sampling 2023-04-30 18:59:58 +02:00
ltdrdata
5ea39fed9c
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-30 22:44:39 +09:00
comfyanonymous
4cea9aecda Make nodes easier to resize. 2023-04-29 20:53:03 -04:00
comfyanonymous
c66db06763 Make ConditioningSetMask area option a bit more clear.
Make ConditioningSetArea override the set_area_to_bounds.
2023-04-29 20:25:05 -04:00
comfyanonymous
071011aebe Mask strength should be separate from area strength. 2023-04-29 20:06:53 -04:00
ltdrdata
ae641eeb3d
Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-04-30 05:21:01 +09:00
comfyanonymous
870fae62e7 Merge branch 'condition_by_mask_node' of https://github.com/guill/ComfyUI 2023-04-29 15:05:18 -04:00
comfyanonymous
a89cbb6651 Merge branch 'filter-search-by-type' of https://github.com/pythongosssss/ComfyUI 2023-04-29 15:03:08 -04:00
pythongosssss
15a4c0db3b - button hover style
- ensure context menu is always above everything
2023-04-29 17:29:07 +01:00
pythongosssss
ffd0f9f417 Search filter by type 2023-04-29 17:19:14 +01:00
Jacob Segal
af02393c2a Default to sampling entire image
By default, when applying a mask to a condition, the entire image will
still be used for sampling. The new "set_area_to_bounds" option on the
node will allow the user to automatically limit conditioning to the
bounds of the mask.

I've also removed the dependency on torchvision for calculating bounding
boxes. I've taken the opportunity to fix some frustrating details in the
other version:
1. An all-0 mask will no longer cause an error
2. Indices are returned as integers instead of floats so they can be
   used to index into tensors.
2023-04-29 00:16:58 -07:00
ltdrdata
e6707a06f7
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-29 15:03:45 +09:00
Dr.Lt.Data
b7a1fbcbbe print message if clipspace content cannot editable 2023-04-29 15:02:14 +09:00
Dr.Lt.Data
9d332bec0e crash fix 2023-04-29 14:42:47 +09:00
Dr.Lt.Data
286b731de3 copy/paste bug fixes for batch images
enhance selector preview on clipspace menu
add img_paste_mode option into clipspace menu
2023-04-29 14:39:03 +09:00
comfyanonymous
056e5545ff Don't try to get vram from xpu or cuda when directml is enabled. 2023-04-29 00:28:48 -04:00
ltdrdata
8aac84a2e4
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-29 10:53:22 +09:00
comfyanonymous
2ca934f7d4 You can now select the device index with: --directml id
Like this for example: --directml 1
2023-04-28 16:51:35 -04:00
comfyanonymous
cab80973d1 Fix Readme. 2023-04-28 16:20:27 -04:00
comfyanonymous
0306371e54 Add "Installing" link to top of readme. 2023-04-28 16:18:54 -04:00
comfyanonymous
3baded9892 Basic torch_directml support. Use --directml to use it. 2023-04-28 14:28:57 -04:00
comfyanonymous
ab9a9deff4 Fix nightly CI builds.
No cu121 builds for windows yet.
2023-04-28 09:03:39 -04:00
ltdrdata
612003d3ea
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-28 21:55:07 +09:00
comfyanonymous
e543ecad69 Fix the nightly build not being packaged correctly. 2023-04-28 08:50:12 -04:00
ltdrdata
8d454f4785 support batch images on clipspace, maskeditor 2023-04-28 21:47:16 +09:00
comfyanonymous
27bf9392ac Switch stable standalone dependencies to stable xformers.
Switch nightly standalone to cu121.
2023-04-28 08:40:32 -04:00
ltdrdata
1ce7350304 fix copy (clipspace) action
imgs[0] copy -> whole imgs copy
2023-04-28 20:31:27 +09:00
Jacob Segal
e214c917ae Add Condition by Mask node
This PR adds support for a Condition by Mask node. This node allows
conditioning to be limited to a non-rectangle area.
2023-04-27 20:03:27 -07:00
ltdrdata
90db9b6681
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-28 02:06:13 +09:00
comfyanonymous
e958dfdd4d Make notebook work on python3.7 2023-04-27 10:59:47 -04:00
ltdrdata
b84be990c2
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-27 19:29:40 +09:00
comfyanonymous
5a971cecdb Add callback to sampler function.
Callback format is: callback(step, x0, x)
2023-04-27 04:38:44 -04:00
Lt.Dr.Data
27664b5bd9 robust patch 2023-04-27 15:41:19 +09:00
Lt.Dr.Data
716640b3eb preview fix 2023-04-27 15:33:54 +09:00
Lt.Dr.Data
eb3b6c0581 optimize 2023-04-27 15:29:07 +09:00
Lt.Dr.Data
1f9e88fcd1 Enable brush preview for key and slider events 2023-04-27 14:59:02 +09:00