diff --git a/code/BlenderDNA.h b/code/BlenderDNA.h index c5d85e43c..4257d9ca5 100644 --- a/code/BlenderDNA.h +++ b/code/BlenderDNA.h @@ -209,7 +209,7 @@ class Structure public: Structure() - : cache_idx(-1) + : cache_idx(static_cast(-1) ) {} public: diff --git a/code/BlenderScene.cpp b/code/BlenderScene.cpp index 1bb8f807c..0addd013b 100644 --- a/code/BlenderScene.cpp +++ b/code/BlenderScene.cpp @@ -2,7 +2,7 @@ Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- -Copyright (c) 2006-2010, ASSIMP Development Team +Copyright (c) 2006-2016, ASSIMP Development Team All rights reserved. Redistribution and use of this software in source and binary forms, diff --git a/code/BlenderSceneGen.h b/code/BlenderSceneGen.h index 73eb1f927..92c727eb2 100644 --- a/code/BlenderSceneGen.h +++ b/code/BlenderSceneGen.h @@ -2,7 +2,7 @@ Open Asset Import Library (ASSIMP) ---------------------------------------------------------------------- -Copyright (c) 2006-2010, ASSIMP Development Team +Copyright (c) 2006-2016, ASSIMP Development Team All rights reserved. Redistribution and use of this software in source and binary forms, diff --git a/test/regression/db.zip b/test/regression/db.zip index 575062e0e..62a76956f 100644 Binary files a/test/regression/db.zip and b/test/regression/db.zip differ diff --git a/test/regression/run.py b/test/regression/run.py index 2a9bdb0de..d615a174e 100755 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -185,6 +185,7 @@ def process_dir(d, outfile_results, zipin, result ): shellparams = {'stdout':outfile_results, 'stderr':outfile_results, 'shell':False} print("Processing directory " + d) + all = "" for f in sorted(os.listdir(d)): fullpath = os.path.join(d, f) if os.path.isdir(fullpath) and not f[:1] == '.':