Merge branch 'main' into perf/slicing-optimizations

.gitattributes

@@ -10,3 +10,6 @@
 # resume after `call :label`. With LF endings that offset can land wrong and the
 # label lookup fails, so keep these CRLF whatever the platform.
 *.bat text eol=crlf
+
+# OCCT BRep fixtures, kept byte for byte as OCCT wrote them.
+*.brep -text

CMakeLists.txt

@@ -1131,7 +1131,8 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
     if (NOT OCCT_LIBS)
         message(FATAL_ERROR "OCCT_LIBS is not set; libslic3r must be configured first.")
     endif ()
-    set(_occt_bin "${CMAKE_PREFIX_PATH}/bin/occt")
+    string(TOUPPER "${config}" _config_upper)
+    set(_occt_bin "${OCCT_BIN_DIR_${_config_upper}}")
     set(_occt_dlls "")
     set(_occt_staged "")
     set(_missing_occt "")

deps/OCCT/0001-OCCT-fix.patch

@@ -1,264 +0,0 @@
-diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake
-index 00000000..00000001 100644
---- a/adm/cmake/occt_defs_flags.cmake
-+++ b/adm/cmake/occt_defs_flags.cmake
-@@ -134,7 +134,11 @@
-     set (CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}")
-   endif()
-   # Optimize size of binaries
--  set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
-+  # clang-cl reports the Clang compiler ID, and OCCT builds shared on Windows,
-+  # where the MSVC-style linker gets this flag as an argument it does not know.
-+  if (NOT WIN32)
-+    set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-s ${CMAKE_SHARED_LINKER_FLAGS}")
-+  endif()
- elseif(MINGW)
-   add_definitions(-D_WIN32_WINNT=0x0601)
-   # _WIN32_WINNT=0x0601 (use Windows 7 SDK)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d98acc0f..28eb8eb4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -225,7 +225,7 @@ if (NOT DEFINED INSTALL_DIR_BIN)
-   if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
-     set (INSTALL_DIR_BIN "bin" CACHE PATH "${INSTALL_DIR_BIN_DESCR}")
-   else()
--    set (INSTALL_DIR_BIN "${OS_WITH_BIT}/${COMPILER}/bin" CACHE PATH "${INSTALL_DIR_BIN_DESCR}")
-+    set (INSTALL_DIR_BIN "bin/occt" CACHE PATH "${INSTALL_DIR_BIN_DESCR}")
-   endif()
- endif()
- 
-@@ -243,11 +243,11 @@ if (NOT DEFINED INSTALL_DIR_LIB)
-   if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
-     set (INSTALL_DIR_LIB "lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
-   else()
--    set (INSTALL_DIR_LIB "${OS_WITH_BIT}/${COMPILER}/lib" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
-+    set (INSTALL_DIR_LIB "lib/occt" CACHE PATH "${INSTALL_DIR_LIB_DESCR}")
-   endif()
- endif()
- 
--# OCCT headers: <prefix>/inc for windows,
-+# OCCT headers: <prefix>/include for windows,
- #               <prefix>/include/opencascade-7.0.0 for unix
- if (NOT DEFINED INSTALL_DIR_INCLUDE)
-   if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
-@@ -256,7 +256,7 @@ if (NOT DEFINED INSTALL_DIR_INCLUDE)
-       set (INSTALL_DIR_INCLUDE "include/opencascade-${OCC_VERSION_STRING_EXT}" CACHE PATH "${INSTALL_DIR_INCLUDE_DESCR}" FORCE)
-     endif()
-   else()
--    set (INSTALL_DIR_INCLUDE "inc" CACHE PATH "${INSTALL_DIR_INCLUDE_DESCR}")
-+    set (INSTALL_DIR_INCLUDE "include/occt" CACHE PATH "${INSTALL_DIR_INCLUDE_DESCR}")
-   endif()
- endif()
- 
-@@ -330,7 +330,7 @@ if (NOT DEFINED INSTALL_DIR_CMAKE)
-       set (INSTALL_DIR_CMAKE "lib/cmake/opencascade" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-     endif()
-   else()
--    set (INSTALL_DIR_CMAKE "cmake" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-+    set (INSTALL_DIR_CMAKE "lib/cmake/occt" CACHE PATH "${INSTALL_DIR_CMAKE_DESCR}")
-   endif()
- endif()
- 
-@@ -338,13 +338,13 @@ endif()
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_resources")
- 
- # install LICENSE_LGPL_21.txt and OCCT_LGPL_EXCEPTION.txt files
--if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
--  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" "${INSTALL_DIR_DOC}")
--  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" "${INSTALL_DIR_DOC}")
--else()
--  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" ".")
--  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" ".")
--endif()
-+#if ("${INSTALL_DIR_LAYOUT}" STREQUAL "Unix")
-+#  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" "${INSTALL_DIR_DOC}")
-+#  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" "${INSTALL_DIR_DOC}")
-+#else()
-+#  OCCT_INSTALL_FILE_OR_DIR ("LICENSE_LGPL_21.txt" ".")
-+#  OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" ".")
-+#endif()
- 
- if(APPLE)
-   set (INSTALL_NAME_DIR "" CACHE STRING "install_name library suffix on OS X (e.g. @executable_path/../Frameworks)")
-@@ -850,34 +850,34 @@ endif()
- 
- # build directories
- if (SINGLE_GENERATOR)
--  set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}")
--  set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BIN_LETTER}")
--  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib${BIN_LETTER}")
-+  set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/occt")
-+  set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/occt")
-+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/occt")
-   if (WIN32)
--    set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin${BIN_LETTER}")
-+    set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/occt")
-   endif()
- endif()
- 
--set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
--set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
--set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib")
-+set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/lib/occt")
-+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/occt")
-+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/lib/occt")
- 
--set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
--set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
--set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libi")
-+set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/lib/occt/RelWithDebInfo")
-+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/bin/occt/RelWithDebInfo")
-+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/lib/occt/RelWithDebInfo")
- 
--set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
--set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
--set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/libd")
-+set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib/occt/Debug")
-+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/occt/Debug")
-+set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/lib/occt/Debug")
- 
- if (WIN32)
--  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin")
--  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini")
--  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind")
-+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/bin/occt")
-+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/bin/occt/RelWithDebInfo")
-+  set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/bin/occt/Debug")
- endif()
- 
- string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
--message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT header files into ${CMAKE_BINARY_DIR}/inc ...")
-+message (STATUS "\nInfo: \(${CURRENT_TIME}\) Start collecting all OCCT header files into ${CMAKE_BINARY_DIR}/include/occt ...")
- 
- # collect all the headers to <binary dir>/inc folder
- COLLECT_AND_INSTALL_OCCT_HEADER_FILES ("${CMAKE_BINARY_DIR}" "${BUILD_TOOLKITS}" "${CMAKE_SOURCE_DIR}/src" "${INSTALL_DIR_INCLUDE}")
-@@ -984,9 +984,9 @@ if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}")
- 
-   set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
- 
--  file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
-+  #file (WRITE "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" "${CUSTOM_CONTENT}")
- else()
--  OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
-+  #OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.${SCRIPT_EXT}.main" "custom.${SCRIPT_EXT}" "custom.${SCRIPT_EXT}" "${INSTALL_DIR_SCRIPT}")
- endif()
- 
- if (WIN32)
-@@ -1007,7 +1007,7 @@ endforeach()
- 
- # write current custom.bat/sh (for install directory)
- set (SUB_CUSTOM_BUILD_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.install.${SCRIPT_EXT}")
--OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_DIR_SCRIPT}")
-+#OCCT_CONFIGURE_AND_INSTALL ("adm/templates/custom.install.${SCRIPT_EXT}.in" "${SUB_CUSTOM_BUILD_NAME}" "${SUB_CUSTOM_NAME}" "${INSTALL_DIR_SCRIPT}")
- 
- # write current custom.bat/sh (for build directory)
- OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")
-@@ -1019,9 +1019,9 @@ endif()
- 
- if (WIN32)
-   # env script for draw in building environment
--  OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
-+  #OCCT_CONFIGURE ("adm/templates/env.${SCRIPT_EXT}.in" "env.${SCRIPT_EXT}")
-   # install env script
--  install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}")
-+  #install (FILES "${CMAKE_BINARY_DIR}/env.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}")
-   # copy build.bat and install.bat scripts to CMake binary folder
-   OCCT_COPY_FILE_OR_DIR ("adm/templates/build.bat" "${CMAKE_BINARY_DIR}")
-   OCCT_COPY_FILE_OR_DIR ("adm/templates/install.bat" "${CMAKE_BINARY_DIR}")
-@@ -1043,12 +1043,12 @@ endif()
- FILE_TO_LIST ("adm/RESOURCES" RESOURCES)
- foreach(RESOURCE ${RESOURCES})
-   get_filename_component(RESOURCE_FOLDER ${RESOURCE} DIRECTORY)
--  if(NOT "${RESOURCE_FOLDER}" STREQUAL "")
--    get_filename_component(RESOURCE_FOLDER ${RESOURCE_FOLDER} NAME)
--    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/${RESOURCE_FOLDER}")
--  else()
--    OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR_RESOURCE}")
--  endif()
-+  #if(NOT "${RESOURCE_FOLDER}" STREQUAL "")
-+  #  get_filename_component(RESOURCE_FOLDER ${RESOURCE_FOLDER} NAME)
-+  #  OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR_RESOURCE}/${RESOURCE_FOLDER}")
-+  #else()
-+  #  OCCT_INSTALL_FILE_OR_DIR ("src/${RESOURCE}" "${INSTALL_DIR_RESOURCE}")
-+  #endif()
- endforeach()
- 
- if (BUILD_SAMPLES_QT)
-diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
-index 224c96b1..8c94a1c5 100644
---- a/adm/cmake/occt_macros.cmake
-+++ b/adm/cmake/occt_macros.cmake
-@@ -608,7 +608,7 @@ macro (OCCT_INSERT_CODE_FOR_TARGET)
-   install(CODE "if (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$\")
-     set (OCCT_INSTALL_BIN_LETTER \"\")
-   elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\")
--    set (OCCT_INSTALL_BIN_LETTER \"i\")
-+    set (OCCT_INSTALL_BIN_LETTER \"\")
-   elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\")
-     set (OCCT_INSTALL_BIN_LETTER \"d\")
-   endif()")
-diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
-index 550e0e2f..7ac1a3b8 100644
---- a/adm/cmake/occt_toolkit.cmake
-+++ b/adm/cmake/occt_toolkit.cmake
-@@ -241,7 +241,7 @@
-     else()
-       set (aReleasePdbConf)
-     endif()
--    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
-+    install (FILES  $<TARGET_PDB_FILE:${PROJECT_NAME}>
-              CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
-              DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
-   endif()
-diff --git a/src/Font/Font_FTFont.cxx b/src/Font/Font_FTFont.cxx
-index 5ae9899f..0a17372b 100644
---- a/src/Font/Font_FTFont.cxx
-+++ b/src/Font/Font_FTFont.cxx
-@@ -103,9 +103,11 @@ bool Font_FTFont::Init (const Handle(NCollection_Buffer)& theData,
-   {
-     throw Standard_ProgramError ("Font_FTFont, Light and Normal hinting styles are mutually exclusive");
-   }
-+#ifdef HAVE_FREETYPE
-   setLoadFlag (FT_LOAD_TARGET_LIGHT,   (theParams.FontHinting & Font_Hinting_Light) != 0);
-   setLoadFlag (FT_LOAD_NO_HINTING,     (theParams.FontHinting & Font_Hinting_Normal) == 0
-                                     && (theParams.FontHinting & Font_Hinting_Light)  == 0);
-+#endif
- 
-   // manage native / autohinting
-   if ((theParams.FontHinting & Font_Hinting_ForceAutohint) != 0
-@@ -113,8 +115,10 @@ bool Font_FTFont::Init (const Handle(NCollection_Buffer)& theData,
-   {
-     throw Standard_ProgramError ("Font_FTFont, ForceAutohint and NoAutohint are mutually exclusive");
-   }
-+#ifdef HAVE_FREETYPE
-   setLoadFlag (FT_LOAD_FORCE_AUTOHINT, (theParams.FontHinting & Font_Hinting_ForceAutohint) != 0);
-   setLoadFlag (FT_LOAD_NO_AUTOHINT,    (theParams.FontHinting & Font_Hinting_NoAutohint) != 0);
-+#endif
- 
-   if (!myFTLib->IsValid())
-   {
-From 7236e83dcc1e7284e66dc61e612154617ef715d6 Mon Sep 17 00:00:00 2001
-From: dpasukhi <dpasukhi@opencascade.com>
-Date: Tue, 27 Aug 2024 11:33:29 +0100
-Subject: [PATCH] 0033808: Coding - FreeType Use unsigned point and contour
- indexing in `FT_Outline`
-
-Changes to auto instead of specific type
----
- src/StdPrs/StdPrs_BRepFont.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/StdPrs/StdPrs_BRepFont.cxx b/src/StdPrs/StdPrs_BRepFont.cxx
-index ab2d9b3c9f..cd701879b1 100644
---- a/src/StdPrs/StdPrs_BRepFont.cxx
-+++ b/src/StdPrs/StdPrs_BRepFont.cxx
-@@ -457,7 +457,7 @@ Standard_Boolean StdPrs_BRepFont::renderGlyph (const Standard_Utf32Char theChar,
-   for (short aContour = 0, aStartIndex = 0; aContour < anOutline->n_contours; ++aContour)
-   {
-     const FT_Vector* aPntList = &anOutline->points[aStartIndex];
--    const char* aTags      = &anOutline->tags[aStartIndex];
-+    const auto* aTags      = &anOutline->tags[aStartIndex];
-     const short anEndIndex = anOutline->contours[aContour];
-     const short aPntsNb    = (anEndIndex - aStartIndex) + 1;
-     aStartIndex = anEndIndex + 1;

deps/OCCT/OCCT.cmake

@@ -1,5 +1,5 @@
-# clang-cl cannot emit IGESAppli_GeneralModule.cxx on ARM64
-# (llvm/llvm-project#62081). cl and clang-cl share an ABI.
+# clang-cl cannot emit some OCCT sources for ARM64 (llvm/llvm-project#62081).
+# cl and clang-cl share an ABI.
 set(_occt_compiler_args "")
 if ("${DEPS_ARCH}" STREQUAL "arm64" AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
     set(_occt_compiler_args -DCMAKE_C_COMPILER:STRING=cl -DCMAKE_CXX_COMPILER:STRING=cl)
@@ -15,31 +15,31 @@ endif()
 # (fillet/offset/loft), whose only consumer is the parametric Design/CAD tab. With it OFF
 # the deps prefix matches upstream exactly.
 #
-# With it ON the delta is THREE toolkits, not two: TKFillet (7.40 MiB archive, used via
-# BRepFilletAPI), TKOffset (5.38 MiB, used via BRepOffsetAPI) and TKFeat (4.42 MiB), which
-# nothing here references but which the module flag builds anyway -- it is all-or-nothing
-# per module. The module's other nine toolkits are built either way, because DataExchange
-# (the STEP path upstream already ships) depends on them.
+# With it ON OCCT also builds TKFillet (used via BRepFilletAPI), TKOffset (used via
+# BRepOffsetAPI), and TKFeat, TKHelix, TKXMesh and TKExpress, which nothing here references
+# but which the module flag builds anyway, since module flags are all-or-nothing. The
+# module's other toolkits are built either way, because DataExchange (the STEP path)
+# depends on them.
 #
 # On macOS/Linux OCCT links statically, so an unreferenced toolkit costs build time and no
-# shipped bytes. The Windows figure is a real DLL cost and has NOT been measured -- an
-# earlier "3.77 MiB, Windows only" note here covered only two of the three toolkits and is
-# not a number to quote. See docs/HLSD/design-tab.md.
-
-if (IN_GIT_REPO)
-    set(OCCT_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OCCT-prefix/src/dep_OCCT)
-endif ()
+# shipped bytes. Windows ships only the DLLs libslic3r links, so the tab adds the TKFillet,
+# TKOffset and TKBool DLLs. See docs/HLSD/design-tab.md.
 
 orcaslicer_add_cmake_project(OCCT
-    URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_0.zip
-    URL_HASH SHA256=28334f0e98f1b1629799783e9b4d21e05349d89e695809d7e6dfa45ea43e1dbc
-    #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
-    PATCH_COMMAND git apply ${OCCT_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
+    URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V8_0_1.zip
+    URL_HASH SHA256=7c033d917ee8f040c0512d289dcc5f02c148889d5bac17c3e25639accb44f0da
     #DEPENDS dep_Boost
     DEPENDS ${FREETYPE_PKG}
     CMAKE_ARGS
         -DCMAKE_CXX_STANDARD=17
         -DBUILD_LIBRARY_TYPE=${library_build_type}
+        # With the Unix layout, OCCT's resources and licenses go under share/ and its scripts
+        # into bin/occt on Windows too. libslic3r finds the CMake package in lib/cmake/occt.
+        -DINSTALL_DIR_LAYOUT=Unix
+        -DINSTALL_DIR_BIN=bin/occt
+        -DINSTALL_DIR_LIB=lib/occt
+        -DINSTALL_DIR_INCLUDE=include/occt
+        -DINSTALL_DIR_CMAKE=lib/cmake/occt
         -DUSE_TK=OFF
         -DUSE_TBB=OFF
 	#-DUSE_FREETYPE=OFF

docs/HLSD/design-tab.md

@@ -51,14 +51,13 @@ widens the existing OCCT build by one module flag in `deps/OCCT/OCCT.cmake`:
 -DBUILD_MODULE_ModelingAlgorithms=${SLIC3R_CAD}
 ```
 
-Most of that module's twelve toolkits were already being built, because `DataExchange` — the
-STEP path upstream ships — depends on them. The delta is `TKFillet` (used through
-`BRepFilletAPI`), `TKOffset` (`BRepOffsetAPI`) and `TKFeat`, which nothing here references but
-which the module flag builds anyway, because OCCT's module flags are all-or-nothing. On macOS
-and Linux OCCT links statically, so an unreferenced toolkit costs build time and no shipped
-bytes; on Windows OCCT builds shared, so the cost there is real DLL bytes. That Windows figure
-has not been measured, and `OCCT.cmake` says so rather than carrying a number that was derived
-from an incomplete toolkit list.
+Most of that module's toolkits are built either way, because `DataExchange`, which the STEP
+importer uses, depends on them. With the flag on, OCCT also builds `TKFillet` (used through
+`BRepFilletAPI`), `TKOffset` (`BRepOffsetAPI`), and `TKFeat`, `TKHelix`, `TKXMesh` and
+`TKExpress`, which nothing here references but which the module flag builds anyway, because
+OCCT's module flags are all-or-nothing. On macOS and Linux OCCT links statically, so an
+unreferenced toolkit costs build time and no shipped bytes. On Windows OCCT builds shared and
+only the linked toolkits ship, so the tab adds the `TKFillet`, `TKOffset` and `TKBool` DLLs.
 
 On Windows the packaging step asserts that every linked OCCT toolkit has a shipped DLL and
 fails the configure with the name of any that is missing, because the alternative failure — a
@@ -117,6 +116,8 @@ that keep it survivable are:
 `Import` features embed the imported solid as an OCCT BRep string inside the recipe rather than
 referencing the source file, so a project opens without the STEP or mesh it was built from.
 The cost is that saved projects are coupled to an OCCT BRep revision.
+`tests/data/cad_brep_occt76.brep` holds a solid written by OCCT 7.6, and its test fails if the
+bundled OCCT can no longer read it.
 
 ## The interaction contract
 

docs/HLSD/prusa-indx-profiles.md

@@ -0,0 +1,54 @@
+# Prusa CORE One INDX profiles
+
+The Prusa bundle provides separate four-tool and eight-tool CORE One INDX models
+with 0.4 mm high-flow nozzles and a 248 x 205 x 270 mm printable volume. These are
+independent-tool printers, not single-extruder MMU3 machines. Both inherit
+`fdm_machine_common_coreone_indx`, which inherits the ordinary CORE One HF
+printer; the concrete printer presets supply their tool-count-dependent arrays. The bed and wizard resources come from Prusa.
+
+The source configuration is PrusaResearch 2.5.10 from
+[Prusa's profile repository](https://github.com/prusa3d/PrusaSlicer-settings-prusa-fff/blob/65c5c8f1e1c3836f306119c49d717759cbc368db/PrusaResearch/2.5.10.ini).
+Its printer, process and filament settings are translated to Orca option names.
+The supplied process presets cover 0.10, 0.15, 0.20 and 0.25 mm layers. Their
+shared `fdm_process_coreone_indx` base inherits the ordinary CORE One HF SPEED
+process, with explicit INDX differences and layer-specific child settings.
+Material presets are shared with the ordinary CORE One family.
+
+## Tool changes and extrusion state
+
+The start script initializes a persistent `tool_init` vector, counts the tools
+used by the job, homes and probes using a loaded tool, calibrates the used tools,
+and primes the initial tool at the cleaning station. The change script preserves
+Prusa's `G27`, `P0`, `T`, `G12`, `G750` and `M906` sequences. It updates
+`e_retracted` so Orca's subsequent unretraction agrees with the script's extrusion.
+Per-tool temperature commands are guarded by `is_extruder_used`.
+
+The off-bed purge station is the default. With a prime tower enabled, a newly
+used tool still receives its initial station purge, while an initialized tool
+uses the source's wipe-tower preparation path. `tool_init` persists across these
+changes; treating every tool selection as first use would change the purge and
+deretraction sequence.
+
+Purge volume uses the filament's minimal purge setting. Orca's optional flush
+volumetric speed is divided by filament cross-sectional area before it is used
+as a linear extrusion-speed override. Prusa's separate `filament_flush_volume`
+override is not available in these profiles. The source's `EXCLUDE_E_START` and
+`EXCLUDE_E_END` internal markers become comments rather than printer commands.
+
+Pressure-advance restoration and automatic pressure-advance emission use the
+selected filament preset's settings. These profiles do not impose machine-owned
+filament overrides. Dock-fan control retains the source's material and layer
+conditions; shutdown parks the tool and turns off the used heaters and dock fan.
+
+## Configuration boundaries
+
+The scripts use Orca's temperature, retraction, fan and speed option names. The
+nozzle-check high-flow flag is fixed because these presets describe HF nozzles;
+the abrasive-material flag is derived from the filament's required nozzle HRC.
+An unset idle temperature uses Orca's zero sentinel. ABS's source XY shrinkage
+compensation is represented using Orca's retained-size percentage.
+
+Prusa's consistent-surface cooling strategy and filament-specific infill crossing
+speed limits have no direct Orca profile equivalent. These presets use Orca's
+native layer-time cooling and material volumetric limits. They do not add slicer
+features or change existing Prusa printer profiles.

resources/hms/hms_action_26A.json

@@ -1,323 +1,323 @@
 {
-    "result": 0,
-    "t": 1765968095,
-    "ver": 202511162200,
-    "data": [
-        {
-            "ecode": "03008041",
-            "image": "",
-            "actions": [
-                4,
-                6
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "03008060",
-            "image": "",
-            "actions": [
-                22
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "12008010",
-            "image": "c31daf51b36e446698f14c6df879ea21.png",
-            "actions": [
-                6,
-                4
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "12FF8010",
-            "image": "f87557495f2f2163a44bde8f4ddd9b8c.png",
-            "actions": [
-                4,
-                6
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "18008016",
-            "image": "",
-            "actions": [
-                4,
-                6
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "07008016",
-            "image": "",
-            "actions": [
-                4,
-                6
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "07018016",
-            "image": "",
-            "actions": [
-                4,
-                6
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "03002E0000030001",
-            "image": "",
-            "actions": [
-                52
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "03004016",
-            "image": "",
-            "actions": [
-                6
-            ],
-            "device": "26A"
-        },
-        {
-            "ecode": "03008019",
-            "image": "",
-            "actions": [
-                4
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0502C026",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004003",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004040",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004042",
-            "image": "",
-            "actions": [
-                36,
-                37
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "03008000",
-            "image": "",
-            "actions": [
-                2
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0C00402D",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004037",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004015",
-            "image": "",
-            "actions": [
-                14
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004007",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0502C014",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0300800C",
-            "image": "",
-            "actions": [
-                2
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004004",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0500402E",
-            "image": "",
-            "actions": [
-                14
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05024001",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0502C012",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0502C010",
-            "image": "",
-            "actions": [
-                35
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05008092",
-            "image": "",
-            "actions": [
-                27,
-                5
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004014",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0300800D",
-            "image": "",
-            "actions": [
-                2,
-                6
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0500402F",
-            "image": "",
-            "actions": [
-                14
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004041",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0500400E",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "05004043",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "0C00402C",
-            "image": "",
-            "actions": [
-                11
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "03008017",
-            "image": "",
-            "actions": [
-                4
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "03008013",
-            "image": "",
-            "actions": [
-                2
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "03008007",
-            "image": "",
-            "actions": [
-                2,
-                5
-            ],
-            "device": "default"
-        },
-        {
-            "ecode": "03008016",
-            "image": "",
-            "actions": [
-                4,
-                5,
-                6
-            ],
-            "device": "default"
-        }
-    ]
+	"result": 0,
+	"t": 1765968095,
+	"ver": 202511162200,
+	"data": [
+		{
+			"ecode": "03008041",
+			"image": "",
+			"actions": [
+				4,
+				6
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "03008060",
+			"image": "",
+			"actions": [
+				22
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "12008010",
+			"image": "c31daf51b36e446698f14c6df879ea21.png",
+			"actions": [
+				6,
+				4
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "12FF8010",
+			"image": "f87557495f2f2163a44bde8f4ddd9b8c.png",
+			"actions": [
+				4,
+				6
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "18008016",
+			"image": "",
+			"actions": [
+				4,
+				6
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "07008016",
+			"image": "",
+			"actions": [
+				4,
+				6
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "07018016",
+			"image": "",
+			"actions": [
+				4,
+				6
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "03002E0000030001",
+			"image": "",
+			"actions": [
+				52
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "03004016",
+			"image": "",
+			"actions": [
+				6
+			],
+			"device": "26A"
+		},
+		{
+			"ecode": "03008019",
+			"image": "",
+			"actions": [
+				4
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0502C026",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004003",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004040",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004042",
+			"image": "",
+			"actions": [
+				36,
+				37
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "03008000",
+			"image": "",
+			"actions": [
+				2
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0C00402D",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004037",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004015",
+			"image": "",
+			"actions": [
+				14
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004007",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0502C014",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0300800C",
+			"image": "",
+			"actions": [
+				2
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004004",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0500402E",
+			"image": "",
+			"actions": [
+				14
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05024001",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0502C012",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0502C010",
+			"image": "",
+			"actions": [
+				35
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05008092",
+			"image": "",
+			"actions": [
+				27,
+				5
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004014",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0300800D",
+			"image": "",
+			"actions": [
+				2,
+				6
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0500402F",
+			"image": "",
+			"actions": [
+				14
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004041",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0500400E",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "05004043",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "0C00402C",
+			"image": "",
+			"actions": [
+				11
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "03008017",
+			"image": "",
+			"actions": [
+				4
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "03008013",
+			"image": "",
+			"actions": [
+				2
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "03008007",
+			"image": "",
+			"actions": [
+				2,
+				5
+			],
+			"device": "default"
+		},
+		{
+			"ecode": "03008016",
+			"image": "",
+			"actions": [
+				4,
+				5,
+				6
+			],
+			"device": "default"
+		}
+	]
 }