merge main

src/libslic3r/TextureToColor/ColorUtils.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Callbacks.hpp"
 #include "libslic3r/Point.hpp"
 #include "TriMesh.hpp"
 #include <array>

src/libslic3r/TextureToColor/TextureToColor.hpp

@@ -11,6 +11,8 @@
 #include <string>
 #include <vector>
 
+namespace cv { class Mat; }
+
 namespace Slic3r { namespace tex2color {
 
 enum class MeshRepairDecision {