merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -50,8 +50,8 @@ public:
  ViewerWidget(QWidget *parent = nullptr);
  ~ViewerWidget();

-  void delete_function();
  void close_window();
+  void wait_until_render_is_paused();

  void paintGL();
  void initializeGL();