merge upstream changes

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-21 00:37:10 +08:00
parent e745ac980e
commit 9f91a8450b
156 changed files with 33597 additions and 65667 deletions
--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
@@ -36,7 +36,7 @@
 namespace Slic3r {
 namespace GUI {

-#define BORDER_W 10
+#define BORDER_W FromDIP(10)

 //------------------------------------------
 //          PhysicalPrinterDialog