Commit Graph

913 Commits

Author SHA1 Message Date
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
Lt.Dr.Data
45b049669b Add support for channel-specific image data retrieval in /view API to fix alpha mask loading issue
When loading an image with an alpha mask in JavaScript canvas, there is an issue where the alpha and RGB channels are premultiplied. To avoid reliance on JavaScript canvas, I added support for channel-specific image data retrieval in the "/view" API. This allows us to retrieve data for each channel separately and fix the alpha mask loading issue. The changes have been committed to the repository.
2023-04-27 14:33:02 +09:00
ltdrdata
a13fee6882
Update web/extensions/core/maskeditor.js
Co-authored-by: missionfloyd <missionfloyd@users.noreply.github.com>
2023-04-27 14:05:36 +09:00
Lt.Dr.Data
d423798cea keyup -> keydown event 2023-04-27 11:54:52 +09:00
Lt.Dr.Data
c66b114879 missionfloyd implementation
* hiding brush preview off the canvas
* change brush size on wheel event
2023-04-27 11:47:44 +09:00
Lt.Dr.Data
d662e9298e refactor: Replace brush preview feature with missionfloyd implementation 2023-04-27 10:25:04 +09:00
Lt.Dr.Data
fc976f48b1 Add cursor functionality to display brush size 2023-04-27 10:15:50 +09:00
ltdrdata
977c1ae506 Merge branch 'feature/maskpainting' of https://github.com/ltdrdata/ComfyUI into feature/maskpainting 2023-04-26 20:44:36 +09:00
ltdrdata
2bed0fad0a remove dbg message 2023-04-26 20:44:22 +09:00
ltdrdata
ce55aa784a
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-26 20:37:45 +09:00
ltdrdata
5cc97cf2bf various bug fixes
* paste action
- prevent opening upload popup
- ensure rendering after widget_value update

* view api update
- support annotated_filepath

* maskeditor layout
- prevent covering button by hidden div
2023-04-26 20:36:58 +09:00
comfyanonymous
3a1f9dba20 If IS_CHANGED returns exception delete the output instead of crashing. 2023-04-26 02:13:56 -04:00
comfyanonymous
951c0c2bbe Don't keep cached outputs for removed nodes. 2023-04-26 02:05:57 -04:00
Jake D
54251ad85e
Colored MultilineWidget (#524)
* fixes colors and z-index

* light mode fix

* Update widgets.js
2023-04-26 01:22:36 -04:00
ltdrdata
d40e08cb5f
Merge branch 'comfyanonymous:master' into feature/maskpainting 2023-04-26 09:17:42 +09:00
comfyanonymous
ee3a12d283 Update litegraph from upstream. 2023-04-25 19:18:50 -04:00
comfyanonymous
07194297fd Python 3.7 support. 2023-04-25 14:02:17 -04:00
Lt.Dr.Data
9926897b78 clean code 2023-04-25 18:02:23 +09:00