diff options
author | bubnikv <bubnikv@gmail.com> | 2017-06-13 13:09:49 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2017-06-13 13:09:49 +0300 |
commit | f7831240e11e1759c87368fe86cb05eb7e30b0d7 (patch) | |
tree | 81197e7f36ba99e6d84705379ca3eb743198f4be /xs | |
parent | a4992602eef7e19721efebf145a3361af227978e (diff) |
Fixed compilation on OSX
Diffstat (limited to 'xs')
-rw-r--r-- | xs/src/libslic3r/Model.hpp | 3 | ||||
-rw-r--r-- | xs/src/libslic3r/Print.cpp | 1 | ||||
-rw-r--r-- | xs/src/libslic3r/PrintConfig.cpp | 6 | ||||
-rw-r--r-- | xs/src/libslic3r/PrintConfig.hpp | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/xs/src/libslic3r/Model.hpp b/xs/src/libslic3r/Model.hpp index 047f23017..3ab717a6f 100644 --- a/xs/src/libslic3r/Model.hpp +++ b/xs/src/libslic3r/Model.hpp @@ -14,6 +14,7 @@ namespace Slic3r { +class Model; class ModelInstance; class ModelMaterial; class ModelObject; @@ -38,7 +39,7 @@ public: // Dynamic configuration storage for the object specific configuration values, overriding the global configuration. DynamicPrintConfig config; - Model* get_model() const { return m_model; }; + Model* get_model() const { return m_model; } void apply(const t_model_material_attributes &attributes) { this->attributes.insert(attributes.begin(), attributes.end()); } diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp index b08e62066..a7153c181 100644 --- a/xs/src/libslic3r/Print.cpp +++ b/xs/src/libslic3r/Print.cpp @@ -148,7 +148,6 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option steps_ignore.insert("use_firmware_retraction"); steps_ignore.insert("use_relative_e_distances"); steps_ignore.insert("use_volumetric_e"); - steps_ignore.insert("set_and_wait_temperatures"); steps_ignore.insert("variable_layer_height"); steps_ignore.insert("wipe"); } diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp index 887046274..10123bf64 100644 --- a/xs/src/libslic3r/PrintConfig.cpp +++ b/xs/src/libslic3r/PrintConfig.cpp @@ -1537,12 +1537,6 @@ PrintConfigDef::PrintConfigDef() def->cli = "use-volumetric-e!"; def->default_value = new ConfigOptionBool(false); - def = this->add("set_and_wait_temperatures", coBool); - def->label = "Use Set and Wait for changing bed temperatures"; - def->tooltip = "Check this to change gcode for temperature changes from not waiting (usually M140) to waiting (usually M190). Only necessary if you have a slow-to-heat bed and the first layer bed temp is lower than the other layers."; - def->cli = "set-and-wait-temperatures!"; - def->default_value = new ConfigOptionBool(false); - def = this->add("variable_layer_height", coBool); def->label = "Enable variable layer height feature"; def->tooltip = "Some printers or printer setups may have difficulties printing with a variable layer height. Enabled by default."; diff --git a/xs/src/libslic3r/PrintConfig.hpp b/xs/src/libslic3r/PrintConfig.hpp index d1e6308cf..9876befa8 100644 --- a/xs/src/libslic3r/PrintConfig.hpp +++ b/xs/src/libslic3r/PrintConfig.hpp @@ -359,7 +359,6 @@ public: ConfigOptionBool use_firmware_retraction; ConfigOptionBool use_relative_e_distances; ConfigOptionBool use_volumetric_e; - ConfigOptionBool set_and_wait_temperatures; ConfigOptionBool variable_layer_height; GCodeConfig(bool initialize = true) : StaticPrintConfig() { @@ -404,7 +403,6 @@ public: OPT_PTR(use_firmware_retraction); OPT_PTR(use_relative_e_distances); OPT_PTR(use_volumetric_e); - OPT_PTR(set_and_wait_temperatures); OPT_PTR(variable_layer_height); return NULL; }; |