[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34945] trunk/blender/source/blender/ collada: fix for build warning with openCOLLADA svn833 reported by Dave Plater.

[Campbell Barton]

Revision: 34945
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34945
Author:   campbellbarton
Date:     2011-02-17 22:57:56 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
fix for build warning with openCOLLADA svn833 reported by Dave Plater.
Also fixed duplicate header define between 2 includes.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/collada_internal.cpp
    trunk/blender/source/blender/collada/collada_internal.h

Modified: trunk/blender/source/blender/collada/collada_internal.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.cpp	2011-02-17 22:38:51 UTC (rev 34944)
+++ trunk/blender/source/blender/collada/collada_internal.cpp	2011-02-17 22:57:56 UTC (rev 34945)
@@ -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) {}

Modified: trunk/blender/source/blender/collada/collada_internal.h
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.h	2011-02-17 22:38:51 UTC (rev 34944)
+++ trunk/blender/source/blender/collada/collada_internal.h	2011-02-17 22:57:56 UTC (rev 34945)
@@ -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_camera_id(Object *ob);
 
-#endif
+#endif /* COLLADA_INTERNAL_H */