Fixed conflicts after cherry-picking c8b4aa5a786e579abfdbf800b5eb1a0f0b04ff92

This commit is contained in:
Lukas Matena
2019-04-18 09:59:17 +02:00
committed by Enrico Turri
parent 9e43193b86
commit cfbd7f8093
6 changed files with 205 additions and 106 deletions

View File

@@ -47,6 +47,8 @@ set(SLIC3R_GUI_SOURCES
GUI/Gizmos/GLGizmoFlatten.hpp
GUI/Gizmos/GLGizmoCut.cpp
GUI/Gizmos/GLGizmoCut.hpp
GUI/GLSelectionRectangle.cpp
GUI/GLSelectionRectangle.hpp
GUI/GLTexture.hpp
GUI/GLTexture.cpp
GUI/GLToolbar.hpp