From e11c5a7a023abee7fdff06095d7f69909ea415fe Mon Sep 17 00:00:00 2001 From: Areloch Date: Wed, 27 Jan 2021 15:10:20 -0600 Subject: [PATCH] Re-fixes terrain edit dragging without breaking paint actions --- Engine/source/gui/worldEditor/terrainEditor.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Engine/source/gui/worldEditor/terrainEditor.cpp b/Engine/source/gui/worldEditor/terrainEditor.cpp index cb836c147..295447948 100644 --- a/Engine/source/gui/worldEditor/terrainEditor.cpp +++ b/Engine/source/gui/worldEditor/terrainEditor.cpp @@ -1897,6 +1897,12 @@ void TerrainEditor::on3DMouseDragged(const Gui3DMouseEvent & event) selChanged = gMouse != gLastMouse; } + if (String::compare(getCurrentAction(), "paintMaterial") != 0) + { + if (mMouseDown) + return; + } + mCurrentAction->process( mMouseBrush, event, true, TerrainAction::Update ); }