Fix license date + remove deprecated macros.

diff --git a/tools/assimp_view/assimp_view.cpp b/tools/assimp_view/assimp_view.cpp
index 80cd342..ddf4b0b 100644 (file)
--- a/tools/assimp_view/assimp_view.cpp
+++ b/tools/assimp_view/assimp_view.cpp
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2015, assimp team
+Copyright (c) 2006-2016, assimp team
 
 All rights reserved.
 

diff --git a/tools/assimp_view/assimp_view.h b/tools/assimp_view/assimp_view.h
index bfcc5f1..7676b57 100644 (file)
--- a/tools/assimp_view/assimp_view.h
+++ b/tools/assimp_view/assimp_view.h
@@ -3,7 +3,7 @@
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------
 
-Copyright (c) 2006-2012, assimp team
+Copyright (c) 2006-2016, assimp team
 
 All rights reserved.
 
@@ -72,13 +72,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../code/StringComparison.h" // ASSIMP_stricmp and ASSIMP_strincmp
 
 // in order for std::min and std::max to behave properly
-#ifndef max
+/*#ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))
 #endif // max
 #ifndef min
 #define min(a,b)            (((a) < (b)) ? (a) : (b))
 #endif // min
-
+*/
 #include <time.h>
 
 // default movement speed