3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into materials

Browse source
This commit is contained in:
Vojtech Kral 2019-09-30 16:12:48 +02:00
commit eb93d2a32d
92 changed files with 1925 additions and 1073 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,6 +215,7 @@ public:
void on_extruders_change(size_t extruders_count);
void on_config_change(const DynamicPrintConfig &config);
void force_filament_colors_update();
// On activating the parent window.
void on_activate();
const DynamicPrintConfig* get_plater_config() const;
@ -229,6 +230,7 @@ public:
int get_selected_object_idx();
bool is_single_full_object_selection() const;
GLCanvas3D* canvas3D();
BoundingBoxf bed_shape_bb() const;
PrinterTechnology printer_technology() const;
void set_printer_technology(PrinterTechnology printer_technology);