Merge remote-tracking branch 'origin/0.33.1'

FyroxEngine · Jan 26, 2024 · 936fc50 · 936fc50
2 parents 7eb6ae3 + 468bbd5
commit 936fc50
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.34 (WIP)
+# 0.34 Engine + 0.21.0 Editor (WIP)
 
 ## Added
 
@@ -16,7 +16,14 @@
 
 - TODO
 
-# 0.33
+# 0.33 Engine + 0.20.1 Editor 
+
+## Fixed
+
+- Fixed occasional crash when undoing node creation
+- Fixed highlighting for objects that were cloned
+
+# 0.33 Engine + 0.20 Editor
 
 ## Added
 

diff --git a/editor/Cargo.toml b/editor/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "fyroxed_base"
 license = "MIT"
-version = "0.20.0"
+version = "0.20.1"
 authors = ["Dmitry Stepanov <[email protected]>"]
 edition = "2021"
 rust-version = "1.72"

diff --git a/editor/src/highlight.rs b/editor/src/highlight.rs
@@ -205,9 +205,11 @@ impl SceneRenderPass for HighlightRenderPass {
             };
 
             for &root_node_handle in self.nodes_to_highlight.iter() {
-                for node_handle in ctx.scene.graph.traverse_handle_iter(root_node_handle) {
-                    if let Some(node) = ctx.scene.graph.try_get(node_handle) {
-                        node.collect_render_data(&mut render_context);
+                if ctx.scene.graph.is_valid_handle(root_node_handle) {
+                    for node_handle in ctx.scene.graph.traverse_handle_iter(root_node_handle) {
+                        if let Some(node) = ctx.scene.graph.try_get(node_handle) {
+                            node.collect_render_data(&mut render_context);
+                        }
                     }
                 }
             }

diff --git a/editor/src/scene/mod.rs b/editor/src/scene/mod.rs
@@ -830,6 +830,16 @@ impl SceneController for GameScene {
         self.camera_controller
             .update(&mut scene.graph, settings, path, dt);
 
+        let mut highlighter = self.highlighter.borrow_mut();
+        highlighter.nodes_to_highlight.clear();
+
+        highlighter.scene_handle = self.scene;
+        if let Selection::Graph(ref selection) = editor_selection {
+            for &handle in selection.nodes() {
+                highlighter.nodes_to_highlight.insert(handle);
+            }
+        }
+
         new_render_target
     }
 
@@ -881,19 +891,6 @@ impl SceneController for GameScene {
                     ));
                 false
             }
-            Message::SelectionChanged { .. } => {
-                let mut highlighter = self.highlighter.borrow_mut();
-                highlighter.nodes_to_highlight.clear();
-
-                highlighter.scene_handle = self.scene;
-                if let Selection::Graph(ref selection) = selection {
-                    for &handle in selection.nodes() {
-                        highlighter.nodes_to_highlight.insert(handle);
-                    }
-                }
-
-                false
-            }
             Message::ProvideSceneHierarchy { view } => {
                 let scene = &engine.scenes[self.scene];
                 engine