Merge branch 'et_world_coordinates' into fs_emboss

# Conflicts:
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
This commit is contained in:
Filip Sykala 2022-04-20 12:13:17 +02:00
commit 7ec422d12f
19 changed files with 331 additions and 91 deletions

View file

@ -175,6 +175,7 @@ public:
std::vector<size_t> load_files(const std::vector<std::string>& input_files, bool load_model = true, bool load_config = true, bool imperial_units = false);
// to be called on drag and drop
bool load_files(const wxArrayString& filenames);
void check_selected_presets_visibility(PrinterTechnology loaded_printer_technology);
const wxString& get_last_loaded_gcode() const { return m_last_loaded_gcode; }