From f5324e23eff28359ffd3fb0f5b0375dd4fddd036 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 31 Mar 2020 19:35:19 +0200 Subject: [PATCH 1/3] closes https://github.com/assimp/assimp/pull/3104: remove unused includes. --- samples/SimpleTexturedOpenGL/CMakeLists.txt | 3 +-- .../SimpleTexturedOpenGL/include/boost_includes.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/include/boost_includes.h diff --git a/samples/SimpleTexturedOpenGL/CMakeLists.txt b/samples/SimpleTexturedOpenGL/CMakeLists.txt index e40c40f29..83cd2746e 100644 --- a/samples/SimpleTexturedOpenGL/CMakeLists.txt +++ b/samples/SimpleTexturedOpenGL/CMakeLists.txt @@ -17,7 +17,6 @@ if ( MSVC ) endif () INCLUDE_DIRECTORIES( - ${Assimp_SOURCE_DIR}/include ${Assimp_SOURCE_DIR}/code ${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR} @@ -30,7 +29,6 @@ LINK_DIRECTORIES( ) ADD_EXECUTABLE( assimp_simpletexturedogl WIN32 - SimpleTexturedOpenGL/include/boost_includes.h SimpleTexturedOpenGL/src/model_loading.cpp ${SAMPLES_SHARED_CODE_DIR}/UTFConverter.cpp ${SAMPLES_SHARED_CODE_DIR}/UTFConverter.h @@ -47,3 +45,4 @@ SET_TARGET_PROPERTIES( assimp_simpletexturedogl PROPERTIES INSTALL( TARGETS assimp_simpletexturedogl DESTINATION "${ASSIMP_BIN_INSTALL_DIR}" COMPONENT assimp-dev ) + diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/include/boost_includes.h b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/include/boost_includes.h deleted file mode 100644 index 7b9c0860e..000000000 --- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/include/boost_includes.h +++ /dev/null @@ -1 +0,0 @@ -#include \ No newline at end of file From 323686f878d1bc7d84eceb6d5683995ab52e8f96 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Tue, 31 Mar 2020 19:59:02 +0200 Subject: [PATCH 2/3] Fix funding --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a932e5377..e0c2bec9e 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ patreon: assimp -Paypal: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4JRJVPXC4QJM4 +custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4JRJVPXC4QJM4 From 06e40b98200b6e0ef34fd0ca8797184cf7e48ae8 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Lortie Date: Tue, 31 Mar 2020 17:22:56 -0400 Subject: [PATCH 3/3] Removed unneeded SceneDiffer.h includes. --- test/unit/ImportExport/utCOBImportExport.cpp | 1 - test/unit/ImportExport/utOFFImportExport.cpp | 1 - test/unit/ImportExport/utOgreImportExport.cpp | 1 - test/unit/ImportExport/utQ3BSPFileImportExport.cpp | 1 - test/unit/ut3DSImportExport.cpp | 1 - test/unit/utAMFImportExport.cpp | 1 - test/unit/utASEImportExport.cpp | 1 - test/unit/utArmaturePopulate.cpp | 1 - test/unit/utAssbinImportExport.cpp | 1 - test/unit/utB3DImportExport.cpp | 1 - test/unit/utDXFImporterExporter.cpp | 1 - test/unit/utFBXImporterExporter.cpp | 1 - test/unit/utM3DImportExport.cpp | 1 - test/unit/utPMXImporter.cpp | 1 - test/unit/utSTLImportExport.cpp | 1 - test/unit/utX3DImportExport.cpp | 1 - test/unit/utXImporterExporter.cpp | 1 - 17 files changed, 17 deletions(-) diff --git a/test/unit/ImportExport/utCOBImportExport.cpp b/test/unit/ImportExport/utCOBImportExport.cpp index bd0260c0d..e0f423d92 100644 --- a/test/unit/ImportExport/utCOBImportExport.cpp +++ b/test/unit/ImportExport/utCOBImportExport.cpp @@ -39,7 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------- */ -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/ImportExport/utOFFImportExport.cpp b/test/unit/ImportExport/utOFFImportExport.cpp index f8413e217..8e5de92d1 100644 --- a/test/unit/ImportExport/utOFFImportExport.cpp +++ b/test/unit/ImportExport/utOFFImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include #include diff --git a/test/unit/ImportExport/utOgreImportExport.cpp b/test/unit/ImportExport/utOgreImportExport.cpp index a63afbb99..0c25a82cb 100644 --- a/test/unit/ImportExport/utOgreImportExport.cpp +++ b/test/unit/ImportExport/utOgreImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/ImportExport/utQ3BSPFileImportExport.cpp b/test/unit/ImportExport/utQ3BSPFileImportExport.cpp index cc3674850..e3dbf9f95 100644 --- a/test/unit/ImportExport/utQ3BSPFileImportExport.cpp +++ b/test/unit/ImportExport/utQ3BSPFileImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/ut3DSImportExport.cpp b/test/unit/ut3DSImportExport.cpp index 7ffc66f1e..8debf6e86 100644 --- a/test/unit/ut3DSImportExport.cpp +++ b/test/unit/ut3DSImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utAMFImportExport.cpp b/test/unit/utAMFImportExport.cpp index 0cbd59a67..e4406702a 100644 --- a/test/unit/utAMFImportExport.cpp +++ b/test/unit/utAMFImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utASEImportExport.cpp b/test/unit/utASEImportExport.cpp index 5d138dcd5..2ddc81f29 100644 --- a/test/unit/utASEImportExport.cpp +++ b/test/unit/utASEImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utArmaturePopulate.cpp b/test/unit/utArmaturePopulate.cpp index d00330ced..8a6036239 100644 --- a/test/unit/utArmaturePopulate.cpp +++ b/test/unit/utArmaturePopulate.cpp @@ -42,7 +42,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "UnitTestPCH.h" #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include #include diff --git a/test/unit/utAssbinImportExport.cpp b/test/unit/utAssbinImportExport.cpp index d679914a9..a1f8c7511 100644 --- a/test/unit/utAssbinImportExport.cpp +++ b/test/unit/utAssbinImportExport.cpp @@ -39,7 +39,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------- */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include #include diff --git a/test/unit/utB3DImportExport.cpp b/test/unit/utB3DImportExport.cpp index e79d87084..2f213aa8c 100644 --- a/test/unit/utB3DImportExport.cpp +++ b/test/unit/utB3DImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utDXFImporterExporter.cpp b/test/unit/utDXFImporterExporter.cpp index c9791db7f..79289f82a 100644 --- a/test/unit/utDXFImporterExporter.cpp +++ b/test/unit/utDXFImporterExporter.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utFBXImporterExporter.cpp b/test/unit/utFBXImporterExporter.cpp index 89b94dddc..30a26d99d 100644 --- a/test/unit/utFBXImporterExporter.cpp +++ b/test/unit/utFBXImporterExporter.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utM3DImportExport.cpp b/test/unit/utM3DImportExport.cpp index 0fc5d2ff3..3fb98a4a2 100644 --- a/test/unit/utM3DImportExport.cpp +++ b/test/unit/utM3DImportExport.cpp @@ -41,7 +41,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utPMXImporter.cpp b/test/unit/utPMXImporter.cpp index d70c4c64e..5ab7a9d6a 100644 --- a/test/unit/utPMXImporter.cpp +++ b/test/unit/utPMXImporter.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "UnitTestPCH.h" -#include "SceneDiffer.h" #include "AbstractImportExportBase.h" #include "MMD/MMDImporter.h" diff --git a/test/unit/utSTLImportExport.cpp b/test/unit/utSTLImportExport.cpp index 94417e260..2b4c3873f 100644 --- a/test/unit/utSTLImportExport.cpp +++ b/test/unit/utSTLImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utX3DImportExport.cpp b/test/unit/utX3DImportExport.cpp index c19842895..5b3438d91 100644 --- a/test/unit/utX3DImportExport.cpp +++ b/test/unit/utX3DImportExport.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include diff --git a/test/unit/utXImporterExporter.cpp b/test/unit/utXImporterExporter.cpp index 07f857227..39cda4e35 100644 --- a/test/unit/utXImporterExporter.cpp +++ b/test/unit/utXImporterExporter.cpp @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AbstractImportExportBase.h" -#include "SceneDiffer.h" #include "UnitTestPCH.h" #include