Fixed Eraser Right Click collision with Ctrl + Right Click select (#2904

) Also, ignore vim files.
mapeditor · Oct 1, 2020 · 6fa954e · 6fa954e
1 parent f4d0b3e
commit 6fa954e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,7 @@ util/java/libtiled-java/target
 
 # Linux perf/debugging
 gmon.out
+
+# Vim files
+*.swp
+*.swo
diff --git a/src/tiled/eraser.cpp b/src/tiled/eraser.cpp
@@ -58,7 +58,7 @@ void Eraser::mousePressed(QGraphicsSceneMouseEvent *event)
             mMode = Erase;
             doErase(false);
             return;
-        } else if (event->button() == Qt::RightButton) {
+        } else if (event->button() == Qt::RightButton && !(event->modifiers() & Qt::ControlModifier)) {
             mStart = tilePosition();
             mMode = RectangleErase;
             return;