Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2017-12-01 20:55:57 +0300
committerbubnikv <bubnikv@gmail.com>2017-12-01 20:55:57 +0300
commitca0626b168a15381ab499fe7d8153934a7889078 (patch)
treea8c86f5031658ef01d06521b0419267d472d91f1 /xs/src/libslic3r
parent354408c7e62f022d86a87fbc13301d4f6d488298 (diff)
Fixed regression bugs regarding print validation,
fixed crashes when loading a config.ini with "compatible_printers" disabled export of "compatible_printers" into gcode and config.ini Enabled compatibility of printing multiple objects with support / no support with a wipe tower.
Diffstat (limited to 'xs/src/libslic3r')
-rw-r--r--xs/src/libslic3r/GCode.cpp3
-rw-r--r--xs/src/libslic3r/Slicing.hpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/xs/src/libslic3r/GCode.cpp b/xs/src/libslic3r/GCode.cpp
index 4e5f8b8fa..a19fd8b53 100644
--- a/xs/src/libslic3r/GCode.cpp
+++ b/xs/src/libslic3r/GCode.cpp
@@ -794,7 +794,8 @@ bool GCode::_do_export(Print &print, FILE *file)
for (size_t i = 0; i < sizeof(configs) / sizeof(configs[0]); ++ i) {
StaticPrintConfig *cfg = configs[i];
for (const std::string &key : cfg->keys())
- fprintf(file, "; %s = %s\n", key.c_str(), cfg->serialize(key).c_str());
+ if (key != "compatible_printers")
+ fprintf(file, "; %s = %s\n", key.c_str(), cfg->serialize(key).c_str());
}
}
diff --git a/xs/src/libslic3r/Slicing.hpp b/xs/src/libslic3r/Slicing.hpp
index 1534e19f5..b4a074bb5 100644
--- a/xs/src/libslic3r/Slicing.hpp
+++ b/xs/src/libslic3r/Slicing.hpp
@@ -103,7 +103,7 @@ inline bool equal_layering(const SlicingParameters &sp1, const SlicingParameters
sp1.layer_height == sp2.layer_height &&
sp1.min_layer_height == sp2.min_layer_height &&
sp1.max_layer_height == sp2.max_layer_height &&
- sp1.max_suport_layer_height == sp2.max_suport_layer_height &&
+// sp1.max_suport_layer_height == sp2.max_suport_layer_height &&
sp1.first_print_layer_height == sp2.first_print_layer_height &&
sp1.first_object_layer_height == sp2.first_object_layer_height &&
sp1.first_object_layer_bridging == sp2.first_object_layer_bridging &&