From: Kim Kulling <kim.kulling@googlemail.com>
Date: Wed, 21 Jun 2017 13:24:06 +0000 (+0200)
Subject: SceneCombiner: fix the build.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=439409bef2d623131ba2a6371dbe0e7b0606980e;p=platform%2Fupstream%2Fassimp.git

SceneCombiner: fix the build.
---

diff --git a/code/AssimpCExport.cpp b/code/AssimpCExport.cpp
index d3c3d32..b8d3264 100644
--- a/code/AssimpCExport.cpp
+++ b/code/AssimpCExport.cpp
@@ -45,8 +45,9 @@ Assimp C export interface. See Exporter.cpp for some notes.
 */
 
 #ifndef ASSIMP_BUILD_NO_EXPORT
+
 #include "CInterfaceIOWrapper.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "ScenePrivate.h"
 #include <assimp/Exporter.hpp>
 
diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp
index 1b8a608..d701f90 100644
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ColladaExporter.h"
 #include "Bitmap.h"
 #include "fast_atof.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "StringUtils.h"
 #include "XMLTools.h"
 #include <assimp/DefaultIOSystem.h>
diff --git a/code/Exporter.cpp b/code/Exporter.cpp
index 5f0e752..bae4d7f 100644
--- a/code/Exporter.cpp
+++ b/code/Exporter.cpp
@@ -54,7 +54,7 @@ Here we implement only the C++ interface (Assimp::Exporter).
 #ifndef ASSIMP_BUILD_NO_EXPORT
 
 #include "BlobIOSystem.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "BaseProcess.h"
 #include "Importer.h" // need this for GetPostProcessingStepInstanceList()
 
diff --git a/code/OptimizeGraph.cpp b/code/OptimizeGraph.cpp
index 8b3df08..04971af 100644
--- a/code/OptimizeGraph.cpp
+++ b/code/OptimizeGraph.cpp
@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "OptimizeGraph.h"
 #include "ProcessHelper.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "Exceptional.h"
 #include <stdio.h>
 
diff --git a/code/OptimizeMeshes.cpp b/code/OptimizeMeshes.cpp
index efbd51b..65a3cad 100644
--- a/code/OptimizeMeshes.cpp
+++ b/code/OptimizeMeshes.cpp
@@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "OptimizeMeshes.h"
 #include "ProcessHelper.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "Exceptional.h"
 
 using namespace Assimp;
diff --git a/code/PretransformVertices.cpp b/code/PretransformVertices.cpp
index 26b8aee..1339053 100644
--- a/code/PretransformVertices.cpp
+++ b/code/PretransformVertices.cpp
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "PretransformVertices.h"
 #include "ProcessHelper.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "Exceptional.h"
 
 using namespace Assimp;
diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp
index a879f31..9bcce42 100644
--- a/code/SceneCombiner.cpp
+++ b/code/SceneCombiner.cpp
@@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *       OptimizeGraph step.
   */
 // ----------------------------------------------------------------------------
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "StringUtils.h"
 #include "fast_atof.h"
 #include "Hash.h"
diff --git a/code/Subdivision.cpp b/code/Subdivision.cpp
index ef5840d..bc5292d 100644
--- a/code/Subdivision.cpp
+++ b/code/Subdivision.cpp
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "Subdivision.h"
-#include "SceneCombiner.h"
+#include <assimp/SceneCombiner.h>
 #include "SpatialSort.h"
 #include "ProcessHelper.h"
 #include "Vertex.h"
diff --git a/code/glTFExporter.cpp b/code/glTFExporter.cpp
index 1fbd17d..695fda7 100644
--- a/code/glTFExporter.cpp
+++ b/code/glTFExporter.cpp
@@ -48,8 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "ByteSwapper.h"
 
 #include "SplitLargeMeshes.h"
-#include "SceneCombiner.h"
 
+#include <assimp/SceneCombiner.h>
 #include <assimp/version.h>
 #include <assimp/IOSystem.hpp>
 #include <assimp/Exporter.hpp>