Skip to content

Commit df0a051

Browse files
authored
Merge branch 'master' into gizmo/1-heart-node
2 parents 8e5a9cc + 5457b4f commit df0a051

128 files changed

Lines changed: 4730 additions & 2017 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 69 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ no-std-types = { path = "node-graph/libraries/no-std-types" }
8080
raster-types = { path = "node-graph/libraries/raster-types" }
8181
vector-types = { path = "node-graph/libraries/vector-types" }
8282
graphic-types = { path = "node-graph/libraries/graphic-types" }
83+
brush-types = { path = "node-graph/libraries/brush-types" }
8384
rendering = { path = "node-graph/libraries/rendering" }
8485
brush-nodes = { path = "node-graph/nodes/brush" }
8586
blending-nodes = { path = "node-graph/nodes/blending" }
@@ -160,15 +161,14 @@ web-sys = { version = "=0.3.98", features = [
160161
"HtmlImageElement",
161162
"ImageBitmapRenderingContext",
162163
] }
163-
winit = { git = "https://github.com/rust-windowing/winit.git" }
164+
winit = "0.31.0-beta.2"
164165
keyboard-types = "0.8"
165166
url = "2.5"
166167
tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt", "rt-multi-thread"] }
167168
# Linebender ecosystem (BEGIN)
168169
kurbo = { version = "0.13", features = ["serde"] }
169-
# TODO: Return to crates.io versions once a release after 0.9 ships the ramp bake's `interpolation_alpha_space` support
170-
vello = { git = "https://github.com/linebender/vello.git", rev = "7073a85d61ee099d1d3595651ddf92302b074348" }
171-
vello_encoding = { git = "https://github.com/linebender/vello.git", rev = "7073a85d61ee099d1d3595651ddf92302b074348" }
170+
vello = "0.10"
171+
vello_encoding = "0.10"
172172
resvg = "0.47"
173173
usvg = "0.47"
174174
simplecss = "0.2"
@@ -260,8 +260,6 @@ lto = "thin"
260260
debug = true
261261

262262
[patch.crates-io]
263-
# Force cargo to use only one version of the dpi crate (vendoring breaks without this)
264-
dpi = { git = "https://github.com/rust-windowing/winit.git" }
265263
rfd = { git = "https://github.com/timon-schelling/rfd.git", branch = "graphite" } # TODO: Remove this once https://github.com/PolyMeilex/rfd/pull/317 is merged and released
266264
cef = { git = "https://github.com/timon-schelling/cef-rs.git", branch = "graphite-149" }
267265
cef-dll-sys = { git = "https://github.com/timon-schelling/cef-rs.git", branch = "graphite-149" }

0 commit comments

Comments
 (0)