3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 14:44:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed conflict after merge with master

Browse source
This commit is contained in:
enricoturri1966 2021-07-29 12:25:28 +02:00
commit 81f4df70dc
22 changed files with 873 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/Plater.hpp
View file

@ -404,10 +404,8 @@ public:
bool inside_snapshot_capture();
#if ENABLE_RENDER_STATISTICS
void toggle_render_statistic_dialog();
bool is_render_statistic_dialog_visible() const;
#endif // ENABLE_RENDER_STATISTICS
// Wrapper around wxWindow::PopupMenu to suppress error messages popping out while tracking the popup menu.
bool PopupMenu(wxMenu *menu, const wxPoint& pos = wxDefaultPosition);