This commit is contained in:
1 parent
9f95ba3082
commit
fcd34f9079
12 files changed
+570
-1
No files matched your search
@@ -14,6 +14,7 @@ use crate::ui::hierarchy_ops::is_entity_locked;
|
||||
use crate::ui::hierarchy_state::HierarchyPanelState;
|
||||
use crate::ui::UiState;
|
||||
use crate::viewport::actor_icons::ActorIconProxy;
|
||||
use crate::viewport::brush_tool::BrushToolState;
|
||||
use crate::viewport::ViewportDisplayMode;
|
||||
use crate::visualizers::EditorVisualizerProxy;
|
||||
use bevy_egui::egui;
|
||||
@@ -102,6 +103,7 @@ fn handle_pick_events(
|
||||
keys: Res<ButtonInput<KeyCode>>,
|
||||
buttons: Res<ButtonInput<MouseButton>>,
|
||||
display: Res<ViewportDisplayMode>,
|
||||
brush_tool: Res<BrushToolState>,
|
||||
gizmo_targets: Query<&GizmoTarget>,
|
||||
hierarchy: Option<Res<HierarchyPanelState>>,
|
||||
) -> Result {
|
||||
@@ -122,6 +124,10 @@ fn handle_pick_events(
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if brush_tool.active {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if gizmo_targets
|
||||
.iter()
|
||||
.any(|g| GizmoTarget::is_focused(g) || GizmoTarget::is_active(g))
|
||||
|
||||
Reference in new issue
Block a user