From 52724138bfc4dd34f1f6cd63b57b72edc9cfeb5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= Date: Sun, 25 Jun 2017 10:26:04 +0300 Subject: [PATCH] libgui|Assimp: Compiling with an unmodified Assimp --- doomsday/sdk/libgui/CMakeLists.txt | 1 + doomsday/sdk/libgui/src/graphics/modeldrawable.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/doomsday/sdk/libgui/CMakeLists.txt b/doomsday/sdk/libgui/CMakeLists.txt index 4bdc2e1845..dd21313340 100644 --- a/doomsday/sdk/libgui/CMakeLists.txt +++ b/doomsday/sdk/libgui/CMakeLists.txt @@ -52,6 +52,7 @@ if (DENG_ASSIMP_EMBEDDED) add_subdirectory (../../external/assimp assimp) set_property (TARGET assimp PROPERTY FOLDER Libraries) set (CMAKE_C_FLAGS ${oldCFlags}) + add_definitions (-DDENG_HAVE_CUSTOMIZED_ASSIMP=1) endif () #---------------------------------------------------------------------------------------- diff --git a/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp b/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp index b0daab433e..764fbb3e1b 100644 --- a/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp +++ b/doomsday/sdk/libgui/src/graphics/modeldrawable.cpp @@ -647,6 +647,8 @@ DENG2_PIMPL(ModelDrawable) { LOG_GL_MSG("Loading model from %s") << file.description(); +#if defined (DENG_HAVE_CUSTOMIZED_ASSIMP) + { /* * MD5: Multiple animation sequences are supported via multiple .md5anim files. * Autodetect if these exist and make a list of their names. @@ -667,6 +669,8 @@ DENG2_PIMPL(ModelDrawable) }); } importer.SetPropertyString(AI_CONFIG_IMPORT_MD5_ANIM_SEQUENCE_NAMES, anims.toStdString()); + } +#endif scene = glData.scene = nullptr; sourcePath = file.path();