From 80805c5747c65e85fc68630bcc41e5b1d41df15b Mon Sep 17 00:00:00 2001 From: remi durand Date: Thu, 10 Jun 2021 22:29:12 +0200 Subject: [PATCH 01/10] fix reprapfirmware and a shortcut help text --- src/libslic3r/PrintConfig.hpp | 2 +- src/slic3r/GUI/KBShortcutsDialog.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index c11c5c8cbe9..45a1f4f8168 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -193,7 +193,7 @@ template<> inline const t_config_enum_values& ConfigOptionEnum::get_en template<> inline const t_config_enum_values& ConfigOptionEnum::get_enum_values() { static t_config_enum_values keys_map = { - {"reprap", gcfRepRap}, + {"reprapfirmware", gcfRepRap}, {"repetier", gcfRepetier}, {"teacup", gcfTeacup}, {"makerware", gcfMakerWare}, diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 6a5c235dd01..42a92b8f1c3 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -109,7 +109,11 @@ void KBShortcutsDialog::fill_shortcuts() { "0-6", L("Camera view") }, { "E", L("Show/Hide object/instance labels") }, // Configuration +#ifdef __APPLE__ + { ctrl + ",", L("Preferences") }, +#else { ctrl + "P", L("Preferences") }, +#endif // Help { "?", L("Show keyboard shortcuts list") } }; From 8cf482d0f7bbc7cedd1865b04e06478999ee2175 Mon Sep 17 00:00:00 2001 From: remi durand Date: Fri, 11 Jun 2021 11:00:21 +0200 Subject: [PATCH 02/10] fix assert in wizard filament supermerill/SuperSlicer#1292 --- src/slic3r/GUI/ConfigWizard.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 5e9961e2eba..3504cb7f04f 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -636,10 +636,10 @@ PageMaterials::PageMaterials(ConfigWizard *parent, Materials *materials, wxStrin update_lists(evt.GetInt(), list_type->GetSelection(), list_vendor->GetSelection()); }); list_type->Bind(wxEVT_LISTBOX, [this](wxCommandEvent &) { - update_lists(list_printer->GetSelection(), list_type->GetSelection(), list_vendor->GetSelection()); + update_lists(-1, list_type->GetSelection(), list_vendor->GetSelection()); }); list_vendor->Bind(wxEVT_LISTBOX, [this](wxCommandEvent &) { - update_lists(list_printer->GetSelection(), list_type->GetSelection(), list_vendor->GetSelection()); + update_lists(-1, list_type->GetSelection(), list_vendor->GetSelection()); }); list_profile->Bind(wxEVT_CHECKLISTBOX, [this](wxCommandEvent &evt) { select_material(evt.GetInt()); }); From 035320d32e8175e5e18cf924c891680caeb54b18 Mon Sep 17 00:00:00 2001 From: remi durand Date: Fri, 11 Jun 2021 18:10:46 +0200 Subject: [PATCH 03/10] disable max bed height --- src/libslic3r/PrintConfig.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index d46443c0eea..c3b6310e99b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -125,7 +125,6 @@ void PrintConfigDef::init_common_params() def->tooltip = L("Set this to the maximum height that can be reached by your extruder while printing."); def->sidetext = L("mm"); def->min = 0; - def->max = 1200; def->mode = comAdvanced; def->set_default_value(new ConfigOptionFloat(200.0)); From 17af6c95d5694958c006a6a1a42f73a192552c9d Mon Sep 17 00:00:00 2001 From: remi durand Date: Fri, 11 Jun 2021 18:11:58 +0200 Subject: [PATCH 04/10] fix shortcut : 'e' (capture) and ctrl+f on settings --- src/slic3r/GUI/MainFrame.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 8b8f1f6dbdb..ca2b3d6c112 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1074,7 +1074,9 @@ void MainFrame::on_sys_color_changed() #ifdef _MSC_VER // \xA0 is a non-breaking space. It is entered here to spoil the automatic accelerators, // as the simple numeric accelerators spoil all numeric data entry. -static const wxString sep = "\t\xA0"; + // note: same for letters + // note: don't work anymore, it doesn't show them to the right. Revert to " - " +static const wxString sep = " - ";//\t\xA0 static const wxString sep_space = "\xA0"; #else static const wxString sep = " - "; @@ -1129,7 +1131,7 @@ static wxMenu* generate_help_menu() static void add_common_view_menu_items(wxMenu* view_menu, MainFrame* mainFrame, std::function can_change_view) { - // The camera control accelerators are captured by GLCanvas3D::on_char(). + // The camera control accelerators are captured by GLCanvas3D::on_char(). So be sure to don't activate the accelerator by using '\t' append_menu_item(view_menu, wxID_ANY, _L("Iso") + sep + "&0", _L("Iso View"), [mainFrame](wxCommandEvent&) { mainFrame->select_view("iso"); }, "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame); view_menu->AppendSeparator(); @@ -1379,8 +1381,8 @@ void MainFrame::init_menubar_as_editor() editMenu->AppendSeparator(); append_menu_item(editMenu, wxID_ANY, _L("Searc&h") + "\tCtrl+F", - _L("Search in settings"), [this](wxCommandEvent&) { m_plater->search(/*m_tabpanel->GetCurrentPage() == */m_plater->IsShown()); }, - "search", nullptr, []() {return true; }, this); + _L("Search in settings"), [this](wxCommandEvent&) { m_plater->search(/*m_tabpanel->GetCurrentPage() == */m_plater->IsShown() && can_change_view()); }, + "search", nullptr, []() { return true; }, this); } // Window menu @@ -1425,9 +1427,9 @@ void MainFrame::init_menubar_as_editor() viewMenu = new wxMenu(); add_common_view_menu_items(viewMenu, this, std::bind(&MainFrame::can_change_view, this)); viewMenu->AppendSeparator(); - append_menu_check_item(viewMenu, wxID_ANY, _L("Show &labels") + "\t" + "E", _L("Show object/instance labels in 3D scene"), - [this](wxCommandEvent&) { m_plater->show_view3D_labels(!m_plater->are_view3D_labels_shown()); }, this, - [this]() { return m_plater->is_view3D_shown() && can_change_view(); }, [this]() { return m_plater->are_view3D_labels_shown(); }, this); + append_menu_check_item(viewMenu, wxID_ANY, _L("Show &labels") + sep + "&e", _L("Show object/instance labels in 3D scene"), + [this](wxCommandEvent&) { m_plater->show_view3D_labels(!m_plater->are_view3D_labels_shown()); /* only called on clic, real event is handled by GLCanvas3D::on_char */ }, this, + [this]() { return m_plater->is_view3D_shown(); }, [this]() { return m_plater->are_view3D_labels_shown(); }, this); append_menu_check_item(viewMenu, wxID_ANY, _L("&Collapse sidebar") + "\t" + "Shift+" + sep_space + "Tab", _L("Collapse sidebar"), [this](wxCommandEvent&) { m_plater->collapse_sidebar(!m_plater->is_sidebar_collapsed()); }, this, [this]() { return can_change_view(); }, [this]() { return m_plater->is_sidebar_collapsed(); }, this); From e67181d2d484c012fa4c295387f23e8ab1da16f2 Mon Sep 17 00:00:00 2001 From: remi durand Date: Fri, 11 Jun 2021 18:56:39 +0200 Subject: [PATCH 05/10] allow Z-Hop retract_lift_top for Gap Fill supermerill/SuperSlicer#1285 --- src/libslic3r/GCode.cpp | 10 ++++++++-- src/libslic3r/GCode.hpp | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 5c6dc30dc9f..1a2fa9c9616 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -3876,6 +3876,9 @@ std::string GCode::_after_extrude(const ExtrusionPath &path) { else gcode += ";_EXTRUDE_END\n"; + if (path.role() != ExtrusionRole::erGapFill ) { + m_last_notgapfill_extrusion_role = path.role(); + } this->set_last_pos(path.last_point()); return gcode; @@ -4003,11 +4006,14 @@ std::string GCode::retract(bool toolchange) length is honored in case wipe path was too short. */ gcode += toolchange ? m_writer.retract_for_toolchange() : m_writer.retract(); bool need_lift = !m_writer.tool_is_extruder() || toolchange || (BOOL_EXTRUDER_CONFIG(retract_lift_first_layer) && m_config.print_retract_lift.value != 0 && this->m_layer_index == 0); + bool last_fill_extusion_role_top_infill = (this->m_last_extrusion_role == ExtrusionRole::erTopSolidInfill); + if(this->m_last_extrusion_role == ExtrusionRole::erGapFill) + last_fill_extusion_role_top_infill = (this->m_last_notgapfill_extrusion_role == ExtrusionRole::erTopSolidInfill); if (!need_lift && m_config.print_retract_lift.value != 0) { if (EXTRUDER_CONFIG_WITH_DEFAULT(retract_lift_top, "") == "Not on top") - need_lift = (this->m_last_extrusion_role != ExtrusionRole::erTopSolidInfill); + need_lift = !last_fill_extusion_role_top_infill; else if (EXTRUDER_CONFIG_WITH_DEFAULT(retract_lift_top, "") == "Only on top") - need_lift = (this->m_last_extrusion_role == ExtrusionRole::erTopSolidInfill); + need_lift = last_fill_extusion_role_top_infill; else need_lift = true; } diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index 3c92322fcd0..e9df3df2a0a 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -359,6 +359,8 @@ class GCode : ExtrusionVisitorConst { double m_volumetric_speed; // Support for the extrusion role markers. Which marker is active? ExtrusionRole m_last_extrusion_role; + // Not know the gapfill role for retract_lift_top + ExtrusionRole m_last_notgapfill_extrusion_role; // Support for G-Code Processor float m_last_height{ 0.0f }; float m_last_layer_z{ 0.0f }; From fbd9f1506ff183508fc7ced68b6955ceb877d119 Mon Sep 17 00:00:00 2001 From: remi durand Date: Fri, 11 Jun 2021 19:42:58 +0200 Subject: [PATCH 06/10] try fix cog --- src/libslic3r/GCode/CoolingBuffer.cpp | 2 +- src/slic3r/GUI/PresetComboBoxes.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/GCode/CoolingBuffer.cpp b/src/libslic3r/GCode/CoolingBuffer.cpp index e47133cc79b..49be67a6e68 100644 --- a/src/libslic3r/GCode/CoolingBuffer.cpp +++ b/src/libslic3r/GCode/CoolingBuffer.cpp @@ -284,7 +284,7 @@ float new_feedrate_to_reach_time_stretch( float time_stretch_final = 0.f; for (auto it = it_begin; it != it_end; ++ it) time_stretch_final += (*it)->time_stretch_when_slowing_down_to_feedrate(new_feedrate); - assert(std::abs(time_stretch - time_stretch_final) < EPSILON); + //assert(std::abs(time_stretch - time_stretch_final) < EPSILON); } #endif /* NDEBUG */ diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 9cc2887b6e2..6839627f71b 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -696,7 +696,14 @@ bool PlaterPresetComboBox::switch_to_tab() wxGetApp().tab_panel()->SetSelection(page_id); // Switch to Settings NotePad - wxGetApp().mainframe->select_tab(MainFrame::ETabType::LastSettings); + if(m_type == Preset::Type::TYPE_PRINT || m_type == Preset::Type::TYPE_SLA_PRINT) + wxGetApp().mainframe->select_tab(MainFrame::ETabType::PrintSettings); + else if (m_type == Preset::Type::TYPE_FILAMENT || m_type == Preset::Type::TYPE_SLA_MATERIAL) + wxGetApp().mainframe->select_tab(MainFrame::ETabType::FilamentSettings); + else if (m_type == Preset::Type::TYPE_PRINTER) + wxGetApp().mainframe->select_tab(MainFrame::ETabType::PrinterSettings); + else + wxGetApp().mainframe->select_tab(MainFrame::ETabType::LastSettings); return true; } From 012595e1079475c3b9d8c6f671f443f82055111e Mon Sep 17 00:00:00 2001 From: remi durand Date: Sat, 12 Jun 2021 17:32:56 +0200 Subject: [PATCH 07/10] Fix crash when gcode data is not valid and comment a problematic assert that get trigger are startup --- src/libslic3r/PresetBundle.cpp | 2 +- src/slic3r/GUI/GCodeViewer.cpp | 50 +++++++++++++++++++--------------- src/slic3r/GUI/Plater.cpp | 8 ++++++ 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index ce7ca17cee7..f709ae926e9 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -470,7 +470,7 @@ void PresetBundle::load_selections(AppConfig &config, const std::string &preferr void PresetBundle::export_selections(AppConfig &config) { assert(this->printers.get_edited_preset().printer_technology() != ptFFF || filament_presets.size() >= 1); - assert(this->printers.get_edited_preset().printer_technology() != ptFFF || filament_presets.size() > 1 || filaments.get_selected_preset_name() == filament_presets.front()); + //assert(this->printers.get_edited_preset().printer_technology() != ptFFF || filament_presets.size() > 1 || filaments.get_selected_preset_name() == filament_presets.front()); config.clear_section("presets"); config.set("presets", "print", prints.get_selected_preset_name()); config.set("presets", "filament", filament_presets.front()); diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 55d31f68437..2fc92f50314 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -3013,7 +3013,9 @@ void GCodeViewer::refresh_render_paths(bool keep_sequential_current_first, bool #if ENABLE_REDUCED_TOOLPATHS_SEGMENT_CAPS for (const auto& [tbuffer_id, ibuffer_id, path_id, sub_path_id] : paths) { TBuffer& buffer = const_cast(m_buffers[tbuffer_id]); + if (buffer.paths.size() <= path_id) return; // invalid data check const Path& path = buffer.paths[path_id]; + if (m_tool_colors.size() <= path.extruder_id) return; // invalid data check #else for (const auto& [buffer, ibuffer_id, path_id, sub_path_id] : paths) { const Path& path = buffer->paths[path_id]; @@ -4192,7 +4194,8 @@ void GCodeViewer::render_legend() const { // shows only extruders actually used for (unsigned char i : m_extruder_ids) { - append_item(EItemType::Rect, m_tool_colors[i], _u8L("Extruder") + " " + std::to_string(i + 1)); + if(m_tool_colors.size() > i) + append_item(EItemType::Rect, m_tool_colors[i], _u8L("Extruder") + " " + std::to_string(i + 1)); } break; } @@ -4200,7 +4203,8 @@ void GCodeViewer::render_legend() const { // shows only filament actually used for (unsigned char i : m_extruder_ids) { - append_item(EItemType::Rect, m_filament_colors[i], _u8L("Filament") + " " + std::to_string(i + 1)); + if (m_filament_colors.size() > i) + append_item(EItemType::Rect, m_filament_colors[i], _u8L("Filament") + " " + std::to_string(i + 1)); } break; } @@ -4232,28 +4236,30 @@ void GCodeViewer::render_legend() const { // shows only extruders actually used for (unsigned char i : m_extruder_ids) { - std::vector>> cp_values = color_print_ranges(i, custom_gcode_per_print_z); - const int items_cnt = static_cast(cp_values.size()); - if (items_cnt == 0) { // There are no color changes, but there are some pause print or custom Gcode - append_item(EItemType::Rect, m_tool_colors[i], _u8L("Extruder") + " " + std::to_string(i + 1) + " " + _u8L("default color")); - } - else { - for (int j = items_cnt; j >= 0; --j) { - // create label for color change item - std::string label = _u8L("Extruder") + " " + std::to_string(i + 1); - if (j == 0) { - label += " " + upto_label(cp_values.front().second.first); - append_item(EItemType::Rect, m_tool_colors[i], label); - break; - } - else if (j == items_cnt) { - label += " " + above_label(cp_values[j - 1].second.second); + if (m_tool_colors.size() > i) { + std::vector>> cp_values = color_print_ranges(i, custom_gcode_per_print_z); + const int items_cnt = static_cast(cp_values.size()); + if (items_cnt == 0) { // There are no color changes, but there are some pause print or custom Gcode + append_item(EItemType::Rect, m_tool_colors[i], _u8L("Extruder") + " " + std::to_string(i + 1) + " " + _u8L("default color")); + } + else { + for (int j = items_cnt; j >= 0; --j) { + // create label for color change item + std::string label = _u8L("Extruder") + " " + std::to_string(i + 1); + if (j == 0) { + label += " " + upto_label(cp_values.front().second.first); + append_item(EItemType::Rect, m_tool_colors[i], label); + break; + } + else if (j == items_cnt) { + label += " " + above_label(cp_values[j - 1].second.second); + append_item(EItemType::Rect, cp_values[j - 1].first, label); + continue; + } + + label += " " + fromto_label(cp_values[j - 1].second.second, cp_values[j].second.first); append_item(EItemType::Rect, cp_values[j - 1].first, label); - continue; } - - label += " " + fromto_label(cp_values[j - 1].second.second, cp_values[j].second.first); - append_item(EItemType::Rect, cp_values[j - 1].first, label); } } } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index fd9084d110d..3f01beaa63a 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5961,7 +5961,15 @@ void Plater::on_config_change(const DynamicPrintConfig &config) { bool update_scheduled = false; bool bed_shape_changed = false; + auto diffs = p->config->diff(config); for (auto opt_key : p->config->diff(config)) { + if (opt_key == "nozzle_diameter") { + if (p->config->option(opt_key)->values.size() > config.option(opt_key)->values.size()) { + //lower number of extuders, please don't try to display the old gcode. + p->reset_gcode_toolpaths(); + p->gcode_result.reset(); + } + } if (opt_key == "filament_colour") { update_scheduled = true; // update should be scheduled (for update 3DScene) #2738 From 70e1f0ebf9c0d33af63e81ede476c7214bed897b Mon Sep 17 00:00:00 2001 From: remi durand Date: Sat, 12 Jun 2021 18:47:44 +0200 Subject: [PATCH 08/10] fix wx assert on printer swap supermerill/SuperSlicer#1292 --- src/slic3r/GUI/PresetComboBoxes.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 6839627f71b..852121e80ee 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -128,13 +128,16 @@ PresetComboBox::PresetComboBox(wxWindow* parent, Preset::Type preset_type, const // So, use GetSelection() from event parameter auto selected_item = evt.GetSelection(); - auto marker = reinterpret_cast(this->GetClientData(selected_item)); - if (marker >= LABEL_ITEM_DISABLED && marker < LABEL_ITEM_MAX) - this->SetSelection(this->m_last_selected); - else if (on_selection_changed && (m_last_selected != selected_item || m_collection->current_is_dirty())) { - m_last_selected = selected_item; - on_selection_changed(selected_item); - evt.StopPropagation(); + //protected as selected_item is often at a weird value + if (selected_item < this->GetCount() && selected_item >= 0) { + auto marker = reinterpret_cast(this->GetClientData(selected_item)); + if (marker >= LABEL_ITEM_DISABLED && marker < LABEL_ITEM_MAX) + this->SetSelection(this->m_last_selected); + else if (on_selection_changed && (m_last_selected != selected_item || m_collection->current_is_dirty())) { + m_last_selected = selected_item; + on_selection_changed(selected_item); + evt.StopPropagation(); + } } evt.Skip(); }); @@ -451,6 +454,8 @@ wxBitmap* PresetComboBox::get_bmp( std::string bitmap_key, const std::string& m bool PresetComboBox::is_selected_physical_printer() { auto selected_item = this->GetSelection(); + if (selected_item >= this->GetCount() || selected_item < 0) + std::cout << "qfohadfh \n"; auto marker = reinterpret_cast(this->GetClientData(selected_item)); return marker == LABEL_ITEM_PHYSICAL_PRINTER; } @@ -572,6 +577,8 @@ PlaterPresetComboBox::PlaterPresetComboBox(wxWindow *parent, Preset::Type preset Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &evt) { auto selected_item = evt.GetSelection(); + if (selected_item >= this->GetCount() || selected_item < 0) + std::cout << "qfoshiofh \n"; auto marker = reinterpret_cast(this->GetClientData(selected_item)); if (marker >= LABEL_ITEM_MARKER && marker < LABEL_ITEM_MAX) { this->SetSelection(this->m_last_selected); @@ -919,7 +926,8 @@ TabPresetComboBox::TabPresetComboBox(wxWindow* parent, Preset::Type preset_type) // m_presets_choice->GetSelection() will return first item, because search in PopupListCtrl is case-insensitive. // So, use GetSelection() from event parameter auto selected_item = evt.GetSelection(); - + if (selected_item >= this->GetCount() || selected_item < 0) + std::cout << "qfoazfhasuiofh \n"; auto marker = reinterpret_cast(this->GetClientData(selected_item)); if (marker >= LABEL_ITEM_DISABLED && marker < LABEL_ITEM_MAX) { this->SetSelection(this->m_last_selected); From a8af77359f106b68cf313ccadc2819fd1fe0f058 Mon Sep 17 00:00:00 2001 From: remi durand Date: Sat, 12 Jun 2021 18:47:59 +0200 Subject: [PATCH 09/10] update profiles --- resources/profiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles b/resources/profiles index 44b68776a21..f64fb444097 160000 --- a/resources/profiles +++ b/resources/profiles @@ -1 +1 @@ -Subproject commit 44b68776a21faaa15499c4027fc183f595734ab4 +Subproject commit f64fb444097e5f3e48c6b28f6c3453bd8eb839ef From c082d1972f30ba85d377df776b90aefe069517bc Mon Sep 17 00:00:00 2001 From: remi durand Date: Sat, 12 Jun 2021 19:47:32 +0200 Subject: [PATCH 10/10] fix rc build --- .github/workflows/ccpp_mac_rc.yml | 2 +- .github/workflows/ccpp_ubuntu_rc.yml | 2 +- .github/workflows/ccpp_win_rc.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml index ef258d699b2..8ab5360f153 100644 --- a/.github/workflows/ccpp_mac_rc.yml +++ b/.github/workflows/ccpp_mac_rc.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: 'Nigthly' + ref: 'rc' - name: update submodule profiles working-directory: ./resources/profiles run: git submodule update --init diff --git a/.github/workflows/ccpp_ubuntu_rc.yml b/.github/workflows/ccpp_ubuntu_rc.yml index e2729261dbb..a96ae2d829f 100644 --- a/.github/workflows/ccpp_ubuntu_rc.yml +++ b/.github/workflows/ccpp_ubuntu_rc.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: 'Nigthly' + ref: 'rc' - name: update submodule profiles working-directory: ./resources/profiles run: git submodule update --init diff --git a/.github/workflows/ccpp_win_rc.yml b/.github/workflows/ccpp_win_rc.yml index d0ef473ceda..52f31389e53 100644 --- a/.github/workflows/ccpp_win_rc.yml +++ b/.github/workflows/ccpp_win_rc.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: 'Nigthly' + ref: 'rc' - uses: ilammy/msvc-dev-cmd@v1 - name: mkdir in deps run: mkdir deps/build