juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 20:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:fix obj import crash

Browse Source 
jira: github 6333
Change-Id: I3df9edce95b24751f39bcdcbe75e7050fede68a1
(cherry picked from commit 46678882ed2630f3e4593fa4176cec64e8e5ed13)
(cherry picked from commit cb5ac14fd3f111d522696d418d1c175dce88904c)
This commit is contained in:
zhou.xu
2025-03-31 19:18:42 +08:00
committed by Noisyfox
parent c743085c4e
commit 4b7f245740
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/Model.cpp
View File

@@ -46,8 +46,9 @@
namespace Slic3r { namespace Slic3r {
const std::vector<std::string> CONST_FILAMENTS = { const std::vector<std::string> CONST_FILAMENTS = {
"", "4", "8", "0C", "1C", "2C", "3C", "4C", "5C", "6C", "7C", "8C", "9C", "AC", "BC", "CC", "DC", "", "4", "8", "0C", "1C", "2C", "3C", "4C", "5C", "6C", "7C", "8C", "9C", "AC", "BC", "CC","DC",//16
}; // 5 10 15 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 // BBS initialization of static variables
std::map<size_t, ExtruderParams> Model::extruderParamsMap = { {0,{"",0,0}}}; std::map<size_t, ExtruderParams> Model::extruderParamsMap = { {0,{"",0,0}}};
GlobalSpeedMap Model::printSpeedMap{}; 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()) { if (id < CONST_FILAMENTS.size()) {
result = CONST_FILAMENTS[id]; result = CONST_FILAMENTS[id];
} else { } else {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "check error:CONST_FILAMENTS out of array ";
result = "";//error result = "";//error
} }
}; };