diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6087a4493e..fa347a3265 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -941,8 +941,9 @@ void Application::mousePressEvent(QMouseEvent* event) { _mouseVoxelDragging = _mouseVoxel; _mousePressed = true; + maybeEditVoxelUnderCursor(); - if (!maybeEditVoxelUnderCursor()) { + if (!_palette.isActive()) { _pieMenu.mousePressEvent(_mouseX, _mouseY); } diff --git a/interface/src/ToolsPalette.cpp b/interface/src/ToolsPalette.cpp index 341a128f8a..58ec12dc92 100644 --- a/interface/src/ToolsPalette.cpp +++ b/interface/src/ToolsPalette.cpp @@ -77,3 +77,12 @@ void ToolsPalette::render(int screenWidth, int screenHeight) { glPopMatrix(); } + +bool ToolsPalette::isActive() { + for (unsigned int i = 0; i < _tools.size(); ++i) { + if (_tools[i]->isActive()) { + return true; + } + } + return false; +} diff --git a/interface/src/ToolsPalette.h b/interface/src/ToolsPalette.h index 0b4ee95524..b6d446f51d 100644 --- a/interface/src/ToolsPalette.h +++ b/interface/src/ToolsPalette.h @@ -20,6 +20,8 @@ public: void addTool(Tool* tool); void render(int screenWidth, int screenHeight); + bool isActive(); + private: QImage _textureImage; GLuint _textureID;