From 051d01e3395050a479b2c7653b0debbdf41eb465 Mon Sep 17 00:00:00 2001
From: iamAdrianIusca <iamAdrianIusca@gmail.com>
Date: Mon, 9 Mar 2020 22:19:12 +0200
Subject: [PATCH] fixing the conflicts

---
 code/CMakeLists.txt                                         | 4 ++--
 code/Common/PostStepRegistry.cpp                            | 2 +-
 code/{Common => PostProcessing}/SplitByBoneCountProcess.cpp | 0
 code/{Common => PostProcessing}/SplitByBoneCountProcess.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename code/{Common => PostProcessing}/SplitByBoneCountProcess.cpp (100%)
 rename code/{Common => PostProcessing}/SplitByBoneCountProcess.h (99%)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index eec66a305..0dff5d9e4 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -185,8 +185,6 @@ SET( Common_SRCS
   Common/ScenePreprocessor.cpp
   Common/ScenePreprocessor.h
   Common/SkeletonMeshBuilder.cpp
-  Common/SplitByBoneCountProcess.cpp
-  Common/SplitByBoneCountProcess.h
   Common/StandardShapes.cpp
   Common/TargetAnimation.cpp
   Common/TargetAnimation.h
@@ -737,6 +735,8 @@ SET( PostProcessing_SRCS
   PostProcessing/ArmaturePopulate.h
   PostProcessing/GenBoundingBoxesProcess.cpp
   PostProcessing/GenBoundingBoxesProcess.h
+  PostProcessing/SplitByBoneCountProcess.cpp
+  PostProcessing/SplitByBoneCountProcess.h
 )
 SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})
 
diff --git a/code/Common/PostStepRegistry.cpp b/code/Common/PostStepRegistry.cpp
index 21bd2af95..19382165f 100644
--- a/code/Common/PostStepRegistry.cpp
+++ b/code/Common/PostStepRegistry.cpp
@@ -123,7 +123,7 @@ corresponding preprocessor flag to selectively disable steps.
 #   include "PostProcessing/OptimizeGraph.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_SPLITBYBONECOUNT_PROCESS
-#   include "Common/SplitByBoneCountProcess.h"
+#   include "PostProcessing/SplitByBoneCountProcess.h"
 #endif
 #ifndef ASSIMP_BUILD_NO_DEBONE_PROCESS
 #   include "PostProcessing/DeboneProcess.h"
diff --git a/code/Common/SplitByBoneCountProcess.cpp b/code/PostProcessing/SplitByBoneCountProcess.cpp
similarity index 100%
rename from code/Common/SplitByBoneCountProcess.cpp
rename to code/PostProcessing/SplitByBoneCountProcess.cpp
diff --git a/code/Common/SplitByBoneCountProcess.h b/code/PostProcessing/SplitByBoneCountProcess.h
similarity index 99%
rename from code/Common/SplitByBoneCountProcess.h
rename to code/PostProcessing/SplitByBoneCountProcess.h
index 7185d0330..b99830fde 100644
--- a/code/Common/SplitByBoneCountProcess.h
+++ b/code/PostProcessing/SplitByBoneCountProcess.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_SPLITBYBONECOUNTPROCESS_H_INC
 
 #include <vector>
-#include "BaseProcess.h"
+#include "Common/BaseProcess.h"
 
 #include <assimp/mesh.h>
 #include <assimp/scene.h>