mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: UUID conflict issue when referencing volume 

Jira: XXXX
3mf file standard

Change-Id: I953a87294684ea85d03a95e7d2843c096904aeae
Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com>
This commit is contained in:
maosheng.wei 2023-11-06 10:27:40 +08:00 committed by Lane.Wei
parent 086178fbb4
commit f7234aa943
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Format/bbs_3mf.cpp
View File

@ -6411,7 +6411,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
else else
stream << " <" << COMPONENT_TAG << " p:path=\"" << xml_escape(*ppath) << "\" objectid=\"" << volume_id; // << "\"/>\n"; stream << " <" << COMPONENT_TAG << " p:path=\"" << xml_escape(*ppath) << "\" objectid=\"" << volume_id; // << "\"/>\n";
if (m_production_ext) if (m_production_ext)
stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap<boost::uint32_t>{(boost::uint32_t) volume_id} << COMPONENT_UUID_SUFFIX; stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap<boost::uint32_t>{(boost::uint32_t) (volume_id + (object_data.backup_id << 16))} << COMPONENT_UUID_SUFFIX;
const Transform3d &transf = volume->get_matrix(); const Transform3d &transf = volume->get_matrix();
stream << "\" " << TRANSFORM_ATTR << "=\""; stream << "\" " << TRANSFORM_ATTR << "=\"";
for (unsigned c = 0; c < 4; ++c) { for (unsigned c = 0; c < 4; ++c) {
@ -6536,7 +6536,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
if (m_production_ext) { if (m_production_ext) {
std::stringstream stream; std::stringstream stream;
reset_stream(stream); reset_stream(stream);
stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap<boost::uint32_t>{(boost::uint32_t) volume_id} << SUB_OBJECT_UUID_SUFFIX; stream << "\" " << PUUID_ATTR << "=\"" << hex_wrap<boost::uint32_t>{(boost::uint32_t) (volume_id + (object_data.backup_id << 16))} << SUB_OBJECT_UUID_SUFFIX;
//output_buffer += "\" "; //output_buffer += "\" ";
//output_buffer += PUUID_ATTR; //output_buffer += PUUID_ATTR;
//output_buffer += "=\""; //output_buffer += "=\"";