From fb7f4100a761624c342352b1ed96d3e237d312c3 Mon Sep 17 00:00:00 2001
From: Dmitry Stepanov <d1maxa@yandex.ru>
Date: Sun, 11 May 2025 09:55:02 +0300
Subject: [PATCH] fixed grid blending issues

---
 editor/src/camera/mod.rs | 1 +
 editor/src/scene/mod.rs  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/editor/src/camera/mod.rs b/editor/src/camera/mod.rs
index 5d03248b9..c524b0e1e 100644
--- a/editor/src/camera/mod.rs
+++ b/editor/src/camera/mod.rs
@@ -170,6 +170,7 @@ impl CameraController {
         )
         .build(graph);
 
+        graph.link_nodes(grid, camera);
         graph.link_nodes(pivot, root);
 
         Self {
diff --git a/editor/src/scene/mod.rs b/editor/src/scene/mod.rs
index 14ca2f1ca..8d3f19dd0 100644
--- a/editor/src/scene/mod.rs
+++ b/editor/src/scene/mod.rs
@@ -203,7 +203,6 @@ impl GameScene {
         .build()])
         .with_render_path(RenderPath::Forward)
         .build(&mut scene.graph);
-        scene.graph.link_nodes(grid, editor_objects_root);
 
         let (settings_sender, settings_receiver) = mpsc::channel();
         settings.subscribers.push(settings_sender);
@@ -968,6 +967,11 @@ impl SceneController for GameScene {
 
         grid_material.set_property("scale", scale);
 
+        let grid_offset = projection.z_far() - projection.z_near();
+        scene.graph[self.grid]
+            .local_transform_mut()
+            .set_position(Vector3::new(0.0, 0.0, grid_offset));
+
         self.camera_controller.update(
             &mut scene.graph,
             settings,