Use egui master

rerun-io · Dec 3, 2024 · b935f0b · b935f0b
1 parent 56e9f16
commit b935f0b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1923,7 +1923,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 [[package]]
 name = "ecolor"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "bytemuck",
  "color-hex",
@@ -1940,7 +1940,7 @@ checksum = "18aade80d5e09429040243ce1143ddc08a92d7a22820ac512610410a4dd5214f"
 [[package]]
 name = "eframe"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1979,7 +1979,7 @@ dependencies = [
 [[package]]
 name = "egui"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "accesskit",
  "ahash",
@@ -1996,7 +1996,7 @@ dependencies = [
 [[package]]
 name = "egui-wgpu"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2015,7 +2015,7 @@ dependencies = [
 [[package]]
 name = "egui-winit"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "accesskit_winit",
  "ahash",
@@ -2057,7 +2057,7 @@ dependencies = [
 [[package]]
 name = "egui_extras"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "ahash",
  "egui",
@@ -2074,7 +2074,7 @@ dependencies = [
 [[package]]
 name = "egui_glow"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -2092,7 +2092,7 @@ dependencies = [
 [[package]]
 name = "egui_kittest"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "dify",
  "egui",
@@ -2161,7 +2161,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 [[package]]
 name = "emath"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "bytemuck",
  "serde",
@@ -2277,7 +2277,7 @@ dependencies = [
 [[package]]
 name = "epaint"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 dependencies = [
  "ab_glyph",
  "ahash",
@@ -2296,7 +2296,7 @@ dependencies = [
 [[package]]
 name = "epaint_default_fonts"
 version = "0.29.1"
-source = "git+https://github.com/emilk/egui.git?rev=1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3#1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3"
+source = "git+https://github.com/emilk/egui.git?rev=eac7ba01fa37bad35f71bc303561761952361b7c#eac7ba01fa37bad35f71bc303561761952361b7c"
 
 [[package]]
 name = "equivalent"

diff --git a/Cargo.toml b/Cargo.toml
@@ -559,13 +559,13 @@ significant_drop_tightening = "allow" # An update of parking_lot made this trigg
 # As a last resport, patch with a commit to our own repository.
 # ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.
 
-ecolor = { git = "https://github.com/emilk/egui.git", rev = "1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3" }       # this is from a PR. TODO: update to egui master
-eframe = { git = "https://github.com/emilk/egui.git", rev = "1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3" }       # this is from a PR. TODO: update to egui master
-egui = { git = "https://github.com/emilk/egui.git", rev = "1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3" }         # this is from a PR. TODO: update to egui master
-egui_extras = { git = "https://github.com/emilk/egui.git", rev = "1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3" }  # this is from a PR. TODO: update to egui master
-egui_kittest = { git = "https://github.com/emilk/egui.git", rev = "1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3" } # this is from a PR. TODO: update to egui master
-egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3" }    # this is from a PR. TODO: update to egui master
-emath = { git = "https://github.com/emilk/egui.git", rev = "1d6153b56b6e203ce5e5abeaa0e2a04f4a45b7b3" }        # this is from a PR. TODO: update to egui master
+ecolor = { git = "https://github.com/emilk/egui.git", rev = "eac7ba01fa37bad35f71bc303561761952361b7c" }       # egui master 2024-12-03
+eframe = { git = "https://github.com/emilk/egui.git", rev = "eac7ba01fa37bad35f71bc303561761952361b7c" }       # egui master 2024-12-03
+egui = { git = "https://github.com/emilk/egui.git", rev = "eac7ba01fa37bad35f71bc303561761952361b7c" }         # egui master 2024-12-03
+egui_extras = { git = "https://github.com/emilk/egui.git", rev = "eac7ba01fa37bad35f71bc303561761952361b7c" }  # egui master 2024-12-03
+egui_kittest = { git = "https://github.com/emilk/egui.git", rev = "eac7ba01fa37bad35f71bc303561761952361b7c" } # egui master 2024-12-03
+egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "eac7ba01fa37bad35f71bc303561761952361b7c" }    # egui master 2024-12-03
+emath = { git = "https://github.com/emilk/egui.git", rev = "eac7ba01fa37bad35f71bc303561761952361b7c" }        # egui master 2024-12-03
 
 # Useful while developing:
 # ecolor = { path = "../../egui/crates/ecolor" }