Merge remote-tracking branch 'origin/master' into ys_search

2020-03-20 14:56:05 +01:00
parent e188893c28 ec381c5854
commit a46a225cf1
83 changed files with 5730 additions and 4609 deletions
--- a/src/slic3r/GUI/Plater.hpp
+++ b/src/slic3r/GUI/Plater.hpp
@@ -320,6 +320,8 @@ public:
 		Plater *m_plater;
 	};

+    bool inside_snapshot_capture();
+
 	// Wrapper around wxWindow::PopupMenu to suppress error messages popping out while tracking the popup menu.
 	bool PopupMenu(wxMenu *menu, const wxPoint& pos = wxDefaultPosition);
    bool PopupMenu(wxMenu *menu, int x, int y) { return this->PopupMenu(menu, wxPoint(x, y)); }