From 75ce8267c56812948d6d61db9d499a83b6386a58 Mon Sep 17 00:00:00 2001 From: Urho Laukkarinen Date: Sat, 11 May 2024 11:01:40 +0300 Subject: [PATCH] Rebase conflict fix --- crates/transform-gizmo-bevy/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/transform-gizmo-bevy/src/lib.rs b/crates/transform-gizmo-bevy/src/lib.rs index 21eb1fd..a1336dc 100644 --- a/crates/transform-gizmo-bevy/src/lib.rs +++ b/crates/transform-gizmo-bevy/src/lib.rs @@ -121,6 +121,7 @@ impl Default for GizmoOptions { group_targets: true, mode_override: None, hotkeys: Some(GizmoHotkeys::default()), + viewport_rect: None, } } } @@ -166,7 +167,6 @@ impl Default for GizmoHotkeys { toggle_z: Some(KeyCode::KeyZ), deactivate_gizmo: Some(KeyCode::Escape), mouse_click_deactivates: true, - viewport_rect: None, } } }