From afec2e2c4951830708587bb4df8bcf45a1e7c101 Mon Sep 17 00:00:00 2001 From: Engin Manap Date: Sat, 5 Oct 2019 19:23:02 +0200 Subject: [PATCH 1/2] Fix #2693 aiGetVersionMajor return wrong version The 2 constants MinorVersion and MajorVersion are updated for 5.0 --- code/Common/Version.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp index cc94340ac..868cfb06a 100644 --- a/code/Common/Version.cpp +++ b/code/Common/Version.cpp @@ -46,8 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include "ScenePrivate.h" -static const unsigned int MajorVersion = 4; -static const unsigned int MinorVersion = 1; +static const unsigned int MajorVersion = 5; +static const unsigned int MinorVersion = 0; // -------------------------------------------------------------------------------- // Legal information string - don't remove this. From ecd413c86c031900832028c94c0d55488cf26a0a Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sun, 6 Oct 2019 20:19:59 +0200 Subject: [PATCH 2/2] Update utVersion.cpp Fix the unittests as well. --- test/unit/utVersion.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp index 5cfc91ccd..233b2fb0b 100644 --- a/test/unit/utVersion.cpp +++ b/test/unit/utVersion.cpp @@ -4,8 +4,6 @@ Open Asset Import Library (assimp) Copyright (c) 2006-2019, assimp team - - All rights reserved. Redistribution and use of this software in source and binary forms, @@ -55,11 +53,11 @@ TEST_F( utVersion, aiGetLegalStringTest ) { } TEST_F( utVersion, aiGetVersionMinorTest ) { - EXPECT_EQ( aiGetVersionMinor(), 1U ); + EXPECT_EQ( aiGetVersionMinor(), 0U ); } TEST_F( utVersion, aiGetVersionMajorTest ) { - EXPECT_EQ( aiGetVersionMajor(), 4U ); + EXPECT_EQ( aiGetVersionMajor(), 5U ); } TEST_F( utVersion, aiGetCompileFlagsTest ) {