added color picking with ALT key, added crash report library for windows

2017-05-29 08:47:04 +01:00
parent 6d14ccd426
commit 0f721393bb
19 changed files with 170 additions and 26 deletions
--- a/engine/canvas.cpp
+++ b/engine/canvas.cpp
@@ -399,6 +399,15 @@ void ui::Canvas::stroke_update(glm::vec2 point, float pressure)
 }
 void ui::Canvas::stroke_start(glm::vec2 point, float pressure, const ui::Brush& brush)
 {
+    // need to commit this now before starting a new stroke
+    if (m_current_stroke && m_commit_delayed)
+    {
+        stroke_commit();
+        m_current_stroke = nullptr;
+        m_show_tmp = false;
+        m_commit_delayed = false;
+    }
+
    m_current_stroke = std::make_unique<Stroke>();
    m_current_stroke->m_camera = { m_cam_rot, m_cam_fov };
    m_current_stroke->start(brush);