diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index c5aad48a9..0dc7519e8 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -522,7 +522,11 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent) : const std::vector<double> &init_extruders = (project_config.option<ConfigOptionFloats>("wiping_volumes_extruders"))->values; const DynamicPrintConfig* config = &wxGetApp().preset_bundle->printers.get_edited_preset().config; - const std::vector<std::string> &extruder_colours = (config->option<ConfigOptionStrings>("extruder_colour"))->values; + std::vector<std::string> extruder_colours = (config->option<ConfigOptionStrings>("extruder_colour"))->values; + const std::vector<std::string>& filament_colours = (wxGetApp().plater()->get_plater_config()->option<ConfigOptionStrings>("filament_colour"))->values; + for (size_t i=0; i<extruder_colours.size(); ++i) + if (extruder_colours[i] == "" && i < filament_colours.size()) + extruder_colours[i] = filament_colours[i]; WipingDialog dlg(parent, cast<float>(init_matrix), cast<float>(init_extruders), extruder_colours); @@ -4838,6 +4842,11 @@ void Plater::on_activate() this->p->show_delayed_error_message(); } +const DynamicPrintConfig* Plater::get_plater_config() const +{ + return p->config; +} + wxString Plater::get_project_filename(const wxString& extension) const { return p->get_project_filename(extension); diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index 6b488fef1..0dc298566 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -213,6 +213,7 @@ public: void on_config_change(const DynamicPrintConfig &config); // On activating the parent window. void on_activate(); + const DynamicPrintConfig* get_plater_config() const; void update_object_menu();