Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk

src/slic3r/GUI/GUI_ObjectSettings.hpp

@@ -48,6 +48,11 @@ public:
     ~ObjectSettings() {}
 
     bool        update_settings_list();
+    /* Additional check for override options: Add options, if its needed.
+     * Example: if Infill is set to 100%, and Fill Pattern is missed in config_to,
+     * we should add fill_pattern to avoid endless loop in update
+     */
+    bool        add_missed_options(DynamicPrintConfig *config_to, const DynamicPrintConfig &config_from);
     void        update_config_values(DynamicPrintConfig*config);
     void        UpdateAndShow(const bool show) override;
     void        msw_rescale();