From 670889f469600f16ff405ffe052cc0053bee6d1c Mon Sep 17 00:00:00 2001 From: gered Date: Mon, 10 Sep 2012 19:12:29 -0400 Subject: [PATCH] update #includes to match assimp include renames in v3.0 --- src/assimputils/types.h | 2 +- src/assimputils/utils.h | 4 ++-- src/convert/convert.h | 2 +- src/convert/mesh.h | 2 +- src/convert/meshjoint.h | 4 ++-- src/convert/meshmaterial.h | 2 +- src/main.cpp | 6 +++--- src/nodetree/nodetree.h | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/assimputils/types.h b/src/assimputils/types.h index e9beef7..eeaa125 100644 --- a/src/assimputils/types.h +++ b/src/assimputils/types.h @@ -1,7 +1,7 @@ #ifndef __ASSIMPUTILS_TYPES_H_INCLUDED__ #define __ASSIMPUTILS_TYPES_H_INCLUDED__ -#include +#include #include #include diff --git a/src/assimputils/utils.h b/src/assimputils/utils.h index d4387ee..cc8006f 100644 --- a/src/assimputils/utils.h +++ b/src/assimputils/utils.h @@ -1,8 +1,8 @@ #ifndef __ASSIMPUTILS_UTILS_H_INCLUDED__ #define __ASSIMPUTILS_UTILS_H_INCLUDED__ -#include -#include +#include +#include #include #include diff --git a/src/convert/convert.h b/src/convert/convert.h index 39b9f30..c04d8da 100644 --- a/src/convert/convert.h +++ b/src/convert/convert.h @@ -2,7 +2,7 @@ #define __CONVERT_CONVERT_H_INCLUDED__ #include -#include +#include void ConvertStatic(const std::string &outfile, const aiScene *scene); void ConvertSkeletalAnimated(const std::string &outfile, const aiScene *scene); diff --git a/src/convert/mesh.h b/src/convert/mesh.h index 16575ae..0ae8f19 100644 --- a/src/convert/mesh.h +++ b/src/convert/mesh.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include "../assimputils/types.h" #include "meshmaterial.h" #include "meshtriangle.h" diff --git a/src/convert/meshjoint.h b/src/convert/meshjoint.h index e708dba..ad197cb 100644 --- a/src/convert/meshjoint.h +++ b/src/convert/meshjoint.h @@ -3,8 +3,8 @@ #include #include -#include -#include +#include +#include #include struct MeshJoint diff --git a/src/convert/meshmaterial.h b/src/convert/meshmaterial.h index f22977e..9945834 100644 --- a/src/convert/meshmaterial.h +++ b/src/convert/meshmaterial.h @@ -2,7 +2,7 @@ #define __CONVERT_MESHMATERIAL_H_INCLUDED__ #include -#include +#include struct MeshMaterial { diff --git a/src/main.cpp b/src/main.cpp index 1722cb5..688f09a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,9 +2,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "utils/utils.h" #include "assimputils/utils.h" diff --git a/src/nodetree/nodetree.h b/src/nodetree/nodetree.h index 81605b1..38e5319 100644 --- a/src/nodetree/nodetree.h +++ b/src/nodetree/nodetree.h @@ -1,7 +1,7 @@ #ifndef __NODETREE_NODETREE_H_INCLUDED__ #define __NODETREE_NODETREE_H_INCLUDED__ -#include +#include #include void Walk(const aiScene *scene, const std::string &filename);