Updating lib3mf, merging functions works

3MFConsortium · Oct 18, 2024 · c16ec84 · c16ec84
1 parent a23ad7a
commit c16ec84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gladius/src/io/3mf/Importer3mf.cpp b/gladius/src/io/3mf/Importer3mf.cpp
@@ -1263,14 +1263,14 @@ namespace gladius::io
         {
             model3mf->MergeFromModel(modelToMerge.get());
 
-            loadImageStacks(filename, model3mf, doc);
+           loadImageStacks(filename, model3mf, doc);
            loadImplicitFunctions(model3mf, doc);
         }
         catch (Lib3MF::ELib3MFException const & e)
         {
             if (m_eventLogger)
             {
-                m_eventLogger->addEvent({fmt::format("Error #{} while reading 3mf file {}: {}",
+                m_eventLogger->addEvent({fmt::format("Error #{} while merging 3mf file {}: {}",
                                                      filename.string(),
                                                      e.getErrorCode(),
                                                      e.what()),

diff --git a/gladius/vcpkg-overlay-ports/lib3mf/portfile.cmake b/gladius/vcpkg-overlay-ports/lib3mf/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO 3MFConsortium/lib3mf
-   REF a12a270f79ebf1b04d2d03fa8b49e1aa8061aa56
-   SHA512 99d30bd6babf0670994927c2162fdb31b11f2568a9b26d0305592dffa193f2a08f9dbc7bd80188288f090c6bedc1aa7da4640c019c545bfd93bfbc49fdb70953
+   REF ed5e95e7ebf2125f197d1cd5b37cc0a7525c9494
+   SHA512 c4a02dfab333e24705f4f1db18c95899a06e0d78c2b923dc8f6be892421230f2db2ebf799388eda3a56747b6c1107d3f19b4565414ed3aca061e76e8656fa507
    HEAD_REF implicit
 )