From b727420cf235d17d914335092d728c5eff934a7e Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Wed, 21 Jun 2017 14:31:37 +0200
Subject: [PATCH] SceneCOmbiner: Fix the build.

---
 code/3DSExporter.cpp             | 2 +-
 code/AMFImporter_Postprocess.cpp | 2 +-
 code/BlenderModifier.cpp         | 4 ++--
 code/IRRLoader.cpp               | 2 +-
 code/IRRLoader.h                 | 2 +-
 code/LWSLoader.cpp               | 2 +-
 code/LWSLoader.h                 | 2 +-
 code/MD3Loader.cpp               | 2 +-
 code/StepExporter.cpp            | 3 ++-
 code/XFileExporter.cpp           | 3 ++-
 10 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/code/3DSExporter.cpp b/code/3DSExporter.cpp
index 4be83355a..642f7dc57 100644
--- a/code/3DSExporter.cpp
+++ b/code/3DSExporter.cpp
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "3DSExporter.h"
 #include "3DSLoader.h"
 #include "3DSHelper.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "SplitLargeMeshes.h"
 #include "StringComparison.h"
 #include <assimp/IOSystem.hpp>
diff --git a/code/AMFImporter_Postprocess.cpp b/code/AMFImporter_Postprocess.cpp
index 3a48d3b42..085336c51 100644
--- a/code/AMFImporter_Postprocess.cpp
+++ b/code/AMFImporter_Postprocess.cpp
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "AMFImporter.hpp"
 
 // Header files, Assimp.
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "StandardShapes.h"
 #include "StringUtils.h"
 
diff --git a/code/BlenderModifier.cpp b/code/BlenderModifier.cpp
index d71ae5098..161028b6b 100644
--- a/code/BlenderModifier.cpp
+++ b/code/BlenderModifier.cpp
@@ -43,10 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of some blender modifiers (i.e subdivision, mirror).
  */
 
-
 #ifndef ASSIMP_BUILD_NO_BLEND_IMPORTER
+
 #include "BlenderModifier.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "Subdivision.h"
 #include <assimp/scene.h>
 #include <memory>
diff --git a/code/IRRLoader.cpp b/code/IRRLoader.cpp
index 0a1edf253..8cc4acaad 100644
--- a/code/IRRLoader.cpp
+++ b/code/IRRLoader.cpp
@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "fast_atof.h"
 #include "GenericProperty.h"
 
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "StandardShapes.h"
 #include "Importer.h"
 
diff --git a/code/IRRLoader.h b/code/IRRLoader.h
index b8f0df918..d07199c0b 100644
--- a/code/IRRLoader.h
+++ b/code/IRRLoader.h
@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_IRRLOADER_H_INCLUDED
 
 #include "IRRShared.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "Importer.h"
 #include "StringUtils.h"
 #include <assimp/anim.h>
diff --git a/code/LWSLoader.cpp b/code/LWSLoader.cpp
index aa05d63c9..302228556 100644
--- a/code/LWSLoader.cpp
+++ b/code/LWSLoader.cpp
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ParsingUtils.h"
 #include "fast_atof.h"
 
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "GenericProperty.h"
 #include "SkeletonMeshBuilder.h"
 #include "ConvertToLHProcess.h"
diff --git a/code/LWSLoader.h b/code/LWSLoader.h
index 28b4495df..e36d27b77 100644
--- a/code/LWSLoader.h
+++ b/code/LWSLoader.h
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_LWSLOADER_H_INCLUDED
 
 #include "LWOFileData.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "BaseImporter.h"
 
 struct aiImporterDesc;
diff --git a/code/MD3Loader.cpp b/code/MD3Loader.cpp
index 8047b82ba..f6a3a85dd 100644
--- a/code/MD3Loader.cpp
+++ b/code/MD3Loader.cpp
@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_MD3_IMPORTER
 
 #include "MD3Loader.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "GenericProperty.h"
 #include "RemoveComments.h"
 #include "ParsingUtils.h"
diff --git a/code/StepExporter.cpp b/code/StepExporter.cpp
index ae5c12a4c..acf1b6dad 100644
--- a/code/StepExporter.cpp
+++ b/code/StepExporter.cpp
@@ -43,12 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_STEP_EXPORTER
+
 #include "StepExporter.h"
 #include "ConvertToLHProcess.h"
 #include "Bitmap.h"
 #include "BaseImporter.h"
 #include "fast_atof.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include <iostream>
 #include <ctime>
 #include <set>
diff --git a/code/XFileExporter.cpp b/code/XFileExporter.cpp
index df22f0f45..7de494daf 100644
--- a/code/XFileExporter.cpp
+++ b/code/XFileExporter.cpp
@@ -43,12 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_X_EXPORTER
+
 #include "XFileExporter.h"
 #include "ConvertToLHProcess.h"
 #include "Bitmap.h"
 #include "BaseImporter.h"
 #include "fast_atof.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include <assimp/DefaultIOSystem.h>
 #include <ctime>
 #include <set>