Skip to content

Commit d9361d5

Browse files
authored
dont depend on bevy_render in bevy_scene (#20388)
# Objective - dont depend on bevy_render in bevy_scene ## Solution - dont depend on bevy_render in bevy_scene ## Testing - cargo check --examples
1 parent 04cc4bb commit d9361d5

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

crates/bevy_gltf/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ bevy_mesh = { path = "../bevy_mesh", version = "0.17.0-dev" }
3131
bevy_pbr = { path = "../bevy_pbr", version = "0.17.0-dev" }
3232
bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev" }
3333
bevy_render = { path = "../bevy_render", version = "0.17.0-dev" }
34-
bevy_scene = { path = "../bevy_scene", version = "0.17.0-dev", features = [
35-
"bevy_render",
36-
] }
34+
bevy_scene = { path = "../bevy_scene", version = "0.17.0-dev" }
3735
bevy_transform = { path = "../bevy_transform", version = "0.17.0-dev" }
3836
bevy_tasks = { path = "../bevy_tasks", version = "0.17.0-dev" }
3937
bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-features = false, features = [

crates/bevy_internal/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ bevy_text = ["dep:bevy_text", "bevy_image"]
224224

225225
bevy_render = [
226226
"dep:bevy_render",
227-
"bevy_scene?/bevy_render",
228227
"bevy_gizmos?/bevy_render",
229228
"bevy_camera",
230229
"bevy_shader",

crates/bevy_scene/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ serialize = [
1515
"uuid/serde",
1616
"bevy_ecs/serialize",
1717
"bevy_platform/serialize",
18-
"bevy_render?/serialize",
1918
]
2019

2120
[dependencies]
@@ -27,7 +26,7 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.17.0-dev" }
2726
bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev" }
2827
bevy_transform = { path = "../bevy_transform", version = "0.17.0-dev" }
2928
bevy_utils = { path = "../bevy_utils", version = "0.17.0-dev" }
30-
bevy_render = { path = "../bevy_render", version = "0.17.0-dev", optional = true }
29+
bevy_camera = { path = "../bevy_camera", version = "0.17.0-dev" }
3130
bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-features = false, features = [
3231
"std",
3332
] }

crates/bevy_scene/src/components.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ use bevy_reflect::{prelude::ReflectDefault, Reflect};
55
use bevy_transform::components::Transform;
66
use derive_more::derive::From;
77

8-
#[cfg(feature = "bevy_render")]
9-
use bevy_render::view::visibility::Visibility;
8+
use bevy_camera::visibility::Visibility;
109

1110
use crate::{DynamicScene, Scene};
1211

@@ -15,13 +14,13 @@ use crate::{DynamicScene, Scene};
1514
#[derive(Component, Clone, Debug, Default, Deref, DerefMut, Reflect, PartialEq, Eq, From)]
1615
#[reflect(Component, Default, Debug, PartialEq, Clone)]
1716
#[require(Transform)]
18-
#[cfg_attr(feature = "bevy_render", require(Visibility))]
17+
#[require(Visibility)]
1918
pub struct SceneRoot(pub Handle<Scene>);
2019

2120
/// Adding this component will spawn the scene as a child of that entity.
2221
/// Once it's spawned, the entity will have a [`SceneInstance`](crate::SceneInstance) component.
2322
#[derive(Component, Clone, Debug, Default, Deref, DerefMut, Reflect, PartialEq, Eq, From)]
2423
#[reflect(Component, Default, Debug, PartialEq, Clone)]
2524
#[require(Transform)]
26-
#[cfg_attr(feature = "bevy_render", require(Visibility))]
25+
#[require(Visibility)]
2726
pub struct DynamicSceneRoot(pub Handle<DynamicScene>);

0 commit comments

Comments
 (0)