Merge branch 'win32'

[fstl] / src / canvas.cpp

diff --git a/src/canvas.cpp b/src/canvas.cpp
index 4c31c6c8896efab5eeb25986d64a6fe782648848..03f9376b763a633c6c228ffede233fc47dd03c93 100644 (file)
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -41,8 +41,16 @@ void Canvas::set_status(const QString &s)
     update();
 }
 
+void Canvas::clear_status()
+{
+    status = "";
+    update();
+}
+
 void Canvas::initializeGL()
 {
+    initializeGLFunctions();
+
     mesh_shader.addShaderFromSourceFile(QGLShader::Vertex, ":/gl/mesh.vert");
     mesh_shader.addShaderFromSourceFile(QGLShader::Fragment, ":/gl/mesh.frag");
     mesh_shader.link();