diff options
Diffstat (limited to 'src/3rdparty/assimp/code/BlenderIntermediate.h')
| -rw-r--r-- | src/3rdparty/assimp/code/BlenderIntermediate.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/assimp/code/BlenderIntermediate.h b/src/3rdparty/assimp/code/BlenderIntermediate.h index e9aebf4bb..c6f9cba1e 100644 --- a/src/3rdparty/assimp/code/BlenderIntermediate.h +++ b/src/3rdparty/assimp/code/BlenderIntermediate.h @@ -2,7 +2,8 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2016, assimp team +Copyright (c) 2006-2017, assimp team + All rights reserved. Redistribution and use of this software in source and binary forms, @@ -48,9 +49,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BlenderLoader.h" #include "BlenderDNA.h" #include "BlenderScene.h" -#include "BlenderSceneGen.h" #include <deque> -#include "./../include/assimp/material.h" +#include <assimp/material.h> struct aiTexture; @@ -110,7 +110,7 @@ namespace Blender { void operator= (const TempArray&) { } - TempArray(const TempArray& arr) { + TempArray(const TempArray& /*arr*/) { } private: @@ -123,7 +123,7 @@ namespace Blender { struct ObjectCompare { bool operator() (const Object* left, const Object* right) const { - return strcmp(left->id.name, right->id.name) == -1; + return ::strncmp(left->id.name, right->id.name, strlen( left->id.name ) ) == 0; } }; @@ -144,7 +144,7 @@ namespace Blender { struct ObjectCompare { bool operator() (const Object* left, const Object* right) const { - return strcmp(left->id.name, right->id.name) == -1; + return ::strncmp( left->id.name, right->id.name, strlen( left->id.name ) ) == 0; } }; |