TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #462 from Areloch/TerrainEditDragFixup

Browse source 
Re-fixes terrain edit dragging without breaking paint actions
This commit is contained in:
Brian Roberts 2021-01-27 15:11:56 -06:00 • committed by GitHub
commit c2c959122e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/gui/worldEditor/terrainEditor.cpp
View file

@ -1897,6 +1897,12 @@ void TerrainEditor::on3DMouseDragged(const Gui3DMouseEvent & event)
selChanged = gMouse != gLastMouse; selChanged = gMouse != gLastMouse;
} }
if (String::compare(getCurrentAction(), "paintMaterial") != 0)
{
if (mMouseDown)
return;
}
mCurrentAction->process( mMouseBrush, event, true, TerrainAction::Update ); mCurrentAction->process( mMouseBrush, event, true, TerrainAction::Update );
} }