Revert ModelVolumeType separation

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

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>

src/libslic3r/ModelVolumeType.hpp

@@ -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_ */

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"