From e78c9c137e69106c85641dba163a6a156b8931bd Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Tue, 20 May 2025 18:15:44 +0800 Subject: [PATCH] FIX: MAC, do not check for ext mapping jira: [STUDIO-12259] Change-Id: I7c6f7fdfd95fcea4b5c2c82994d4d2318070b11d (cherry picked from commit 5a793fd5d26f2e639f1e636b86638d636f36bf2b) --- src/slic3r/GUI/AmsMappingPopup.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 27cd5095b6..d02c934637 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -840,7 +840,14 @@ void AmsMapingPopup::on_left_down(wxMouseEvent &evt) auto left = item->GetSize(); if (pos.x > p_rect.x && pos.y > p_rect.y && pos.x < (p_rect.x + item->GetSize().x) && pos.y < (p_rect.y + item->GetSize().y)) { - if (item->m_tray_data.type == TrayType::NORMAL && !is_match_material(item->m_tray_data.filament_type)) return; + if (item->m_tray_data.type == TrayType::NORMAL) { + if (!m_ext_mapping_filatype_check && (item->m_ams_id == VIRTUAL_TRAY_MAIN_ID || item->m_ams_id == VIRTUAL_TRAY_DEPUTY_ID)) { + // Do nothing + } else { + if(!is_match_material(item->m_tray_data.filament_type)) { return; } + } + } + if (item->m_tray_data.type == TrayType::EMPTY) return; if ((m_show_type == ShowType::LEFT && item->GetParent()->GetName() == "left") || (m_show_type == ShowType::RIGHT && item->GetParent()->GetName() == "right") ||