This commit is contained in:
1 parent
fcd34f9079
commit
0bfc062ba7
8 files changed
+576
-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_edit::BrushEditMode;
|
||||
use crate::viewport::brush_tool::BrushToolState;
|
||||
use crate::viewport::ViewportDisplayMode;
|
||||
use crate::visualizers::EditorVisualizerProxy;
|
||||
@@ -103,6 +104,7 @@ fn handle_pick_events(
|
||||
keys: Res<ButtonInput<KeyCode>>,
|
||||
buttons: Res<ButtonInput<MouseButton>>,
|
||||
display: Res<ViewportDisplayMode>,
|
||||
brush_mode: Res<BrushEditMode>,
|
||||
brush_tool: Res<BrushToolState>,
|
||||
gizmo_targets: Query<&GizmoTarget>,
|
||||
hierarchy: Option<Res<HierarchyPanelState>>,
|
||||
@@ -124,7 +126,7 @@ fn handle_pick_events(
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if brush_tool.active {
|
||||
if brush_tool.active || brush_mode.is_element_mode() {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user