From 976407fdb10451930eb4764a8c931f7258533dc8 Mon Sep 17 00:00:00 2001
From: Filip Sykala <filip.sykala@prusa3d.cz>
Date: Mon, 4 Oct 2021 14:57:57 +0200
Subject: [PATCH] Add Slic3r:: before union_ex --> needed by linux

---
 src/libslic3r/Emboss.cpp                | 6 +++---
 src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libslic3r/Emboss.cpp b/src/libslic3r/Emboss.cpp
index 57ffbad46a..0ee7db68b1 100644
--- a/src/libslic3r/Emboss.cpp
+++ b/src/libslic3r/Emboss.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <cstdlib>
 #include <boost/nowide/convert.hpp>
-#include <ClipperUtils.hpp>
+#include <ClipperUtils.hpp> // union_ex
 
 #define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation
 #include "imgui/imstb_truetype.h" // stbtt_fontinfo
@@ -91,7 +91,7 @@ std::optional<Emboss::Glyph> Privat::get_glyph(stbtt_fontinfo &font_info, int un
         glyph_polygons.emplace_back(pts);
     }
     // fix for bad defined fonts
-    glyph.shape = union_ex(glyph_polygons);
+    glyph.shape = Slic3r::union_ex(glyph_polygons);
     // inner cw - hole
     // outer ccw - contour
     return glyph;
@@ -475,7 +475,7 @@ ExPolygons Emboss::text2shapes(Font &          font,
         cursor.x() += glyph_opt->advance_width + font_prop.char_gap;
         expolygons_append(result, expolygons);
     }
-    return union_ex(result);
+    return Slic3r::union_ex(result);
     // TODO: simplify after union! Do NOT create 2 close vertices (may cause problem in triangulation)
 }
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index f7d7874dff..a2c3e4ab0d 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -12,6 +12,7 @@
 #include "libslic3r/SVG.hpp" // debug store 
 
 #include "libslic3r/Model.hpp"
+#include "libslic3r/ClipperUtils.hpp" // union_ex
 
 #include "imgui/imgui_stdlib.h" // using std::string for inputs
 #include "nanosvg/nanosvg.h" // load SVG file
@@ -841,7 +842,7 @@ ExPolygons NSVGUtils::to_ExPolygons(NSVGimage *image,
     for (Polygon &polygon : polygons)
         for (Point &p : polygon.points) p.y() *= -1;
 
-    return union_ex(polygons);
+    return Slic3r::union_ex(polygons);
 }
 
 // any existing icon filename to not influence GUI