From ef64aa092ca9366aa4e215ff4cf606ad8cd38d1d Mon Sep 17 00:00:00 2001 From: Gareth Martin Date: Thu, 11 Sep 2014 12:39:14 -0400 Subject: [PATCH] Foliage tool now ignores ctrl key (fix ctrl+click not painting, people are used to that key combo) Fix for not being able to shift+click to erase with the foliage tool (whoops) [CL 2293871 by Gareth Martin in Main branch] --- Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp b/Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp index ab855b9e0f8f..13b1b90c8e67 100644 --- a/Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp +++ b/Engine/Source/Editor/FoliageEdit/Private/FoliageEdMode.cpp @@ -1835,8 +1835,9 @@ bool FEdModeFoliage::InputKey(FEditorViewportClient* ViewportClient, FViewport* { if (Key == EKeys::LeftMouseButton && Event == IE_Pressed) { - if (!Viewport->KeyState(EKeys::MiddleMouseButton) && !Viewport->KeyState(EKeys::RightMouseButton) - && !IsCtrlDown(Viewport) && !IsShiftDown(Viewport) && !IsAltDown(Viewport)) + // Only activate tool if we're not already moving the camera and we're not trying to drag a transform widget + // Not using "if (!ViewportClient->IsMovingCamera())" because it's wrong in ortho viewports :D + if (!Viewport->KeyState(EKeys::MiddleMouseButton) && !Viewport->KeyState(EKeys::RightMouseButton) && !IsAltDown(Viewport) && ViewportClient->GetCurrentWidgetAxis() == EAxisList::None) { if (!bToolActive) {