From 5fc3ee9a213bc54dd881c05f1a143f93f98f66a2 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sun, 17 Jul 2016 13:54:01 +0200 Subject: [PATCH 01/50] fix https://github.com/assimp/assimp/issues/946: use correct test for objectcompare in blender. --- code/BlenderDNA.h | 72 ++++++++++++++++++-------------------- code/BlenderIntermediate.h | 6 ++-- test/CMakeLists.txt | 1 + 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/code/BlenderDNA.h b/code/BlenderDNA.h index 801d68fce..135e38d60 100644 --- a/code/BlenderDNA.h +++ b/code/BlenderDNA.h @@ -61,15 +61,17 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // #define ASSIMP_BUILD_BLENDER_NO_STATS namespace Assimp { - template class StreamReader; - typedef StreamReader StreamReaderAny; - namespace Blender { - class FileDatabase; - struct FileBlockHead; +template class StreamReader; +typedef StreamReader StreamReaderAny; - template