From f022402963b52b79889c0e733e775fde17db899a Mon Sep 17 00:00:00 2001
From: Filip Sykala - NTB T15p <Filip.Sykala@prusa3d.cz>
Date: Tue, 29 Nov 2022 08:42:29 +0100
Subject: [PATCH] Revert ModelVolumeType separation

---
 src/libslic3r/CMakeLists.txt      |  1 -
 src/libslic3r/Model.hpp           |  1 -
 src/libslic3r/ModelVolumeType.hpp | 16 ----------------
 src/slic3r/GUI/Jobs/EmbossJob.hpp |  1 -
 4 files changed, 19 deletions(-)
 delete mode 100644 src/libslic3r/ModelVolumeType.hpp

diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index bee7ceb62..fd641b916 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -183,7 +183,6 @@ set(SLIC3R_SOURCES
     Model.hpp
     ModelArrange.hpp
     ModelArrange.cpp
-    #ModelVolumeType.hpp
     MultiMaterialSegmentation.cpp
     MultiMaterialSegmentation.hpp
     MeshNormals.hpp
diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp
index d514171f1..b280ebcee 100644
--- a/src/libslic3r/Model.hpp
+++ b/src/libslic3r/Model.hpp
@@ -14,7 +14,6 @@
 #include "Arrange.hpp"
 #include "CustomGCode.hpp"
 #include "enum_bitmask.hpp"
-//#include "ModelVolumeType.hpp"
 #include "TextConfiguration.hpp"
 
 #include <map>
diff --git a/src/libslic3r/ModelVolumeType.hpp b/src/libslic3r/ModelVolumeType.hpp
deleted file mode 100644
index 5ae1c6440..000000000
--- a/src/libslic3r/ModelVolumeType.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef slic3r_ModelVolumeType_hpp_
-#define slic3r_ModelVolumeType_hpp_
-
-namespace Slic3r {
-
-enum class ModelVolumeType : int {
-    INVALID    = -1,
-    MODEL_PART = 0,
-    NEGATIVE_VOLUME,
-    PARAMETER_MODIFIER,
-    SUPPORT_BLOCKER,
-    SUPPORT_ENFORCER,
-};
-
-} // namespace Slic3r
-#endif /* slic3r_ModelVolumeType_hpp_ */
diff --git a/src/slic3r/GUI/Jobs/EmbossJob.hpp b/src/slic3r/GUI/Jobs/EmbossJob.hpp
index c8ef7fee6..0081024a0 100644
--- a/src/slic3r/GUI/Jobs/EmbossJob.hpp
+++ b/src/slic3r/GUI/Jobs/EmbossJob.hpp
@@ -5,7 +5,6 @@
 #include <memory>
 #include <string>
 #include <libslic3r/Emboss.hpp>
-//#include <libslic3r/ModelVolumeType.hpp>
 #include "slic3r/Utils/RaycastManager.hpp"
 #include "slic3r/GUI/Camera.hpp"
 #include "Job.hpp"