Explorar el Código

Merge pull request #462 from Areloch/TerrainEditDragFixup

Re-fixes terrain edit dragging without breaking paint actions
Brian Roberts hace 4 años
padre
commit
c2c959122e
Se han modificado 1 ficheros con 6 adiciones y 0 borrados
  1. 6 0
      Engine/source/gui/worldEditor/terrainEditor.cpp

+ 6 - 0
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 );
 }