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 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate

Browse source
This commit is contained in:
Enrico Turri 2018-06-22 12:30:15 +02:00
commit f8982c0ca1
13 changed files with 213 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/src/libslic3r/GCode.cpp
View file

@ -1445,7 +1445,7 @@ void GCode::apply_print_config(const PrintConfig &print_config)
void GCode::append_full_config(const Print& print, std::string& str)
{
const StaticPrintConfig *configs[] = { &print.config, &print.default_object_config, &print.default_region_config };
const StaticPrintConfig *configs[] = { static_cast<const GCodeConfig*>(&print.config), &print.default_object_config, &print.default_region_config };
for (size_t i = 0; i < sizeof(configs) / sizeof(configs[0]); ++i) {
const StaticPrintConfig *cfg = configs[i];
for (const std::string &key : cfg->keys())