diff --git a/code/AssimpCExport.cpp b/code/AssimpCExport.cpp index d3c3d3298..b8d3264a1 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 #include "ScenePrivate.h" #include diff --git a/code/ColladaExporter.cpp b/code/ColladaExporter.cpp index 1b8a60883..d701f905a 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 #include "StringUtils.h" #include "XMLTools.h" #include diff --git a/code/Exporter.cpp b/code/Exporter.cpp index 5f0e75200..bae4d7f80 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 #include "BaseProcess.h" #include "Importer.h" // need this for GetPostProcessingStepInstanceList() diff --git a/code/OptimizeGraph.cpp b/code/OptimizeGraph.cpp index 8b3df0820..04971af5e 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 #include "Exceptional.h" #include diff --git a/code/OptimizeMeshes.cpp b/code/OptimizeMeshes.cpp index efbd51bd0..65a3cadce 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 #include "Exceptional.h" using namespace Assimp; diff --git a/code/PretransformVertices.cpp b/code/PretransformVertices.cpp index 26b8aee34..1339053f7 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 #include "Exceptional.h" using namespace Assimp; diff --git a/code/SceneCombiner.cpp b/code/SceneCombiner.cpp index a879f3123..9bcce4275 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 #include "StringUtils.h" #include "fast_atof.h" #include "Hash.h" diff --git a/code/Subdivision.cpp b/code/Subdivision.cpp index ef5840dac..bc5292dbe 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 #include "SpatialSort.h" #include "ProcessHelper.h" #include "Vertex.h" diff --git a/code/glTFExporter.cpp b/code/glTFExporter.cpp index 1fbd17d1b..695fda76e 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 #include #include #include