diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2018-04-24 19:15:23 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2018-04-24 19:15:23 +0300 |
| commit | 62d67d35ecbeb9199ff74a3927558e8bbd9b3c1a (patch) | |
| tree | 727595dca7125e6da22acd4f82edee377f9df496 /xs/src/libslic3r/Config.hpp | |
| parent | a50bde4267ccadd4617b97b631a657ffaf8d6999 (diff) | |
| parent | 7c7c37a4f4b8c4f14fc5ece0cee84e2742e3e64d (diff) | |
Merge branch 'profile_changes_reset' into updating
Diffstat (limited to 'xs/src/libslic3r/Config.hpp')
| -rw-r--r-- | xs/src/libslic3r/Config.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/xs/src/libslic3r/Config.hpp b/xs/src/libslic3r/Config.hpp index 06db9efef..14050c6cc 100644 --- a/xs/src/libslic3r/Config.hpp +++ b/xs/src/libslic3r/Config.hpp @@ -1047,6 +1047,9 @@ public: void apply_only(const ConfigBase &other, const t_config_option_keys &keys, bool ignore_nonexistent = false); bool equals(const ConfigBase &other) const { return this->diff(other).empty(); } t_config_option_keys diff(const ConfigBase &other) const; + // Use deep_diff to correct return of changed options, + // considering individual options for each extruder + t_config_option_keys deep_diff(const ConfigBase &other) const; t_config_option_keys equal(const ConfigBase &other) const; std::string serialize(const t_config_option_key &opt_key) const; // Set a configuration value from a string, it will call an overridable handle_legacy() |