3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into fs_emboss

Browse source 
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	tests/libslic3r/test_indexed_triangle_set.cpp
This commit is contained in:
Filip Sykala 2021-12-01 14:35:42 +01:00
commit d698df2c31
117 changed files with 22758 additions and 9292 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -178,6 +178,7 @@ public:
void update();
void stop_jobs();
bool is_any_job_running() const;
void select_view(const std::string& direction);
void select_view_3D(const std::string& name);
@ -322,6 +323,9 @@ public:
bool can_replace_with_stl() const;
bool can_mirror() const;
bool can_split(bool to_objects) const;
#if ENABLE_ENHANCED_PRINT_VOLUME_FIT
bool can_scale_to_print_volume() const;
#endif // ENABLE_ENHANCED_PRINT_VOLUME_FIT
void msw_rescale();
void sys_color_changed();
@ -427,6 +431,10 @@ public:
wxMenu* layer_menu();
wxMenu* multi_selection_menu();
static bool has_illegal_filename_characters(const wxString& name);
static bool has_illegal_filename_characters(const std::string& name);
static void show_illegal_characters_warning(wxWindow* parent);
private:
struct priv;
std::unique_ptr<priv> p;