Merge branch 'main' into feature/texdisp-3mf-persistence

This commit is contained in:
SoftFever
2026-10-09 12:15:16 +08:00
committed by GitHub
3323 changed files with 2571005 additions and 2469299 deletions
+12
View File
@@ -1,7 +1,10 @@
#include "TextureDisplacement.hpp"
#include <Eigen/Core>
#include <Eigen/Geometry>
#include <algorithm>
#include <array>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
#include <functional>
@@ -11,11 +14,14 @@
#include <iterator>
#include <limits>
#include <map>
#include <memory>
#include <math.h>
#include <mutex>
#include <numeric>
#include <optional>
#include "nlohmann/json.hpp"
#include <queue>
#include <ratio>
#include <string>
#include <tuple>
#include <unordered_map>
@@ -28,15 +34,21 @@
#include <tbb/parallel_sort.h>
#include <boost/log/trivial.hpp>
#include <utility>
#include <vector>
#include "AABBTreeIndirect.hpp"
#include "MeshBoolean.hpp"
#include "Model.hpp"
#include "PNGReadWrite.hpp"
#include "Point.hpp"
#include "TriangleMesh.hpp"
#include "TextureBake/TextureBakeDisplace.hpp"
#include "TriangleSelector.hpp"
#include "TextureBake/TextureBakeDebug.hpp"
#include "TextureBake/TextureBakeMesh.hpp"
#include "TextureBake/TextureBakePipeline.hpp"
#include "TextureBake/TextureBakeIndex.hpp"
namespace Slic3r {