diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 017420d5d..6df6655fc 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -96,6 +96,7 @@ SET( PUBLIC_HEADERS ${HEADER_PATH}/Exporter.hpp ${HEADER_PATH}/DefaultIOStream.h ${HEADER_PATH}/DefaultIOSystem.h + ${HEADER_PATH}/SceneCombiner.h ) SET( Core_SRCS @@ -148,7 +149,6 @@ SET( Common_SRCS SpatialSort.cpp SpatialSort.h SceneCombiner.cpp - SceneCombiner.h ScenePreprocessor.cpp ScenePreprocessor.h SkeletonMeshBuilder.cpp diff --git a/code/SceneCombiner.h b/include/assimp/SceneCombiner.h similarity index 99% rename from code/SceneCombiner.h rename to include/assimp/SceneCombiner.h index af008b134..ca4e68c7f 100644 --- a/code/SceneCombiner.h +++ b/include/assimp/SceneCombiner.h @@ -143,7 +143,6 @@ struct NodeAttachmentInfo */ #define AI_INT_MERGE_SCENE_GEN_UNIQUE_NAMES_IF_NECESSARY 0x10 - typedef std::pair BoneSrcIndex; // --------------------------------------------------------------------------- @@ -153,7 +152,6 @@ struct BoneWithHash : public std::pair { std::vector pSrcBones; }; - // --------------------------------------------------------------------------- /** @brief Utility for SceneCombiner */