add free and poly selection mask tools, fix some threading gl problems

2017-10-24 14:20:12 +01:00
parent 2a92beca7b
commit b40a5b656b
9 changed files with 197 additions and 137 deletions
--- a/engine/canvas.cpp
+++ b/engine/canvas.cpp
@@ -19,6 +19,8 @@ std::vector<CanvasMode*> ui::Canvas::modes[] = {
    { new CanvasModeCamera, new CanvasModeBasicCamera },
    { new CanvasModeGrid, new CanvasModeBasicCamera },
    { new CanvasModeFill, new CanvasModeBasicCamera },
+    { new CanvasModeMaskFree, new CanvasModeBasicCamera },
+    { new CanvasModeMaskFree, new CanvasModeBasicCamera },
 };
 glm::vec3 ui::Canvas::m_plane_origin[6] = {
    { 0, 0,-1}, // front