juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-05 11:32:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging with master, solving conflicts.

Browse Source
This commit is contained in:
tamasmeszaros
2019-03-26 11:13:28 +01:00
parent 57e28b53f2 82321c7aee
commit a49643ebdb
5 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/SLAPrint.hpp
View File

@@ -366,10 +366,10 @@ public:
}
const PrintObjects& objects() const { return m_objects; }
const SLAPrintConfig& print_config() const { return m_print_config; }
const SLAPrinterConfig& printer_config() const { return m_printer_config; }
const SLAMaterialConfig& material_config() const { return m_material_config; }
const SLAPrintConfig& print_config() const { return m_print_config; }
const SLAPrinterConfig& printer_config() const { return m_printer_config; }
const SLAMaterialConfig& material_config() const { return m_material_config; }
const SLAPrintObjectConfig& default_object_config() const { return m_default_object_config; }
std::string output_filename() const override;