1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-23 10:04:26 +00:00

Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri
2019-03-20 16:09:14 +01:00
11 changed files with 117 additions and 79 deletions
+2
View File
@@ -237,8 +237,10 @@ private:
bool left;
bool middle;
bool right;
GLCanvas3D* parent;
bool any() const { return left || middle || right; }
void reset() { left = middle = right = false; parent = nullptr; }
};
MouseCapture m_mouse_capture;