From e5b0c65c86e005b93508ed5222fd35e7e515235a Mon Sep 17 00:00:00 2001 From: Jakob Hellermann Date: Mon, 22 Feb 2021 04:33:33 +0000 Subject: [PATCH] rename bevy_ui::node module so that bevy_ui::render::node isn't shadowed (#1464) Previously the `mod node` shadowed the `pub use render::node`, and `CAMERA_UI`, `NODE` and `UI_PASS` constants couldn't be used. --- crates/bevy_ui/src/lib.rs | 6 +++--- crates/bevy_ui/src/{node.rs => ui_node.rs} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename crates/bevy_ui/src/{node.rs => ui_node.rs} (100%) diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs index 3a32cfb680..803287d5de 100644 --- a/crates/bevy_ui/src/lib.rs +++ b/crates/bevy_ui/src/lib.rs @@ -3,8 +3,8 @@ pub mod entity; mod flex; mod focus; mod margins; -mod node; mod render; +mod ui_node; pub mod update; pub mod widget; @@ -12,11 +12,11 @@ pub use anchors::*; pub use flex::*; pub use focus::*; pub use margins::*; -pub use node::*; pub use render::*; +pub use ui_node::*; pub mod prelude { - pub use crate::{entity::*, node::*, widget::Button, Anchors, Interaction, Margins}; + pub use crate::{entity::*, ui_node::*, widget::Button, Anchors, Interaction, Margins}; } use bevy_app::prelude::*; diff --git a/crates/bevy_ui/src/node.rs b/crates/bevy_ui/src/ui_node.rs similarity index 100% rename from crates/bevy_ui/src/node.rs rename to crates/bevy_ui/src/ui_node.rs