From 4b7f245740774656698f397c16d507d490c01d2a Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Mon, 31 Mar 2025 19:18:42 +0800 Subject: [PATCH] FIX:fix obj import crash jira: github 6333 Change-Id: I3df9edce95b24751f39bcdcbe75e7050fede68a1 (cherry picked from commit 46678882ed2630f3e4593fa4176cec64e8e5ed13) (cherry picked from commit cb5ac14fd3f111d522696d418d1c175dce88904c) --- src/libslic3r/Model.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index 39caa627e0..bedba3d713 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -46,8 +46,9 @@ namespace Slic3r { const std::vector CONST_FILAMENTS = { - "", "4", "8", "0C", "1C", "2C", "3C", "4C", "5C", "6C", "7C", "8C", "9C", "AC", "BC", "CC", "DC", -}; // 5 10 15 16 + "", "4", "8", "0C", "1C", "2C", "3C", "4C", "5C", "6C", "7C", "8C", "9C", "AC", "BC", "CC","DC",//16 + "EC", "0FC", "1FC", "2FC", "3FC", "4FC", "5FC", "6FC", "7FC", "8FC", "9FC", "AFC", "BFC", "CFC", "DFC", "EFC",//32 +}; // 1 5 10 15 16 // BBS initialization of static variables std::map Model::extruderParamsMap = { {0,{"",0,0}}}; GlobalSpeedMap Model::printSpeedMap{}; @@ -2955,6 +2956,7 @@ static void get_real_filament_id(const unsigned char &id, std::string &result) { if (id < CONST_FILAMENTS.size()) { result = CONST_FILAMENTS[id]; } else { + BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "check error:CONST_FILAMENTS out of array "; result = "";//error } };