diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-18 01:57:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-18 01:57:56 +0300 |
| commit | f77051c2fcd49e327d44c1edf92ebe9a4258c6c0 (patch) | |
| tree | 0b54291466f42871b2ff71b82140fb64d1858fe6 /source/blender/collada | |
| parent | a241ce1fd185ea23ba983311589ddd865d4e50d0 (diff) | |
fix for build warning with openCOLLADA svn833 reported by Dave Plater.
Also fixed duplicate header define between 2 includes.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/collada_internal.cpp | 2 | ||||
| -rw-r--r-- | source/blender/collada/collada_internal.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index 80c8a470888..e8d91fcbb94 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -23,6 +23,8 @@ */ /* COLLADABU_ASSERT, may be able to remove later */ +#include "COLLADABUPlatform.h" + #include "collada_internal.h" UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) {} diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index 72b03a3d090..336f66edffd 100644 --- a/source/blender/collada/collada_internal.h +++ b/source/blender/collada/collada_internal.h @@ -21,8 +21,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef BLENDER_COLLADA_H -#define BLENDER_COLLADA_H +#ifndef COLLADA_INTERNAL_H +#define COLLADA_INTERNAL_H #include <string> #include <vector> @@ -89,4 +89,4 @@ extern std::string get_joint_id(Bone *bone, Object *ob_arm); extern std::string get_camera_id(Object *ob); -#endif +#endif /* COLLADA_INTERNAL_H */ |