[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32345] trunk/blender/source/blender/ collada: Assorted GCC fixes for OpenCOLLADA support

[Nathan Letwory]

Revision: 32345
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32345
Author:   jesterking
Date:     2010-10-06 14:04:56 +0200 (Wed, 06 Oct 2010)

Log Message:
-----------
Assorted GCC fixes for OpenCOLLADA support

Modified Paths:
--------------
    trunk/blender/source/blender/collada/ArmatureExporter.cpp
    trunk/blender/source/blender/collada/DocumentExporter.cpp
    trunk/blender/source/blender/collada/MeshImporter.cpp
    trunk/blender/source/blender/collada/SkinInfo.cpp

Modified: trunk/blender/source/blender/collada/ArmatureExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureExporter.cpp	2010-10-06 11:02:44 UTC (rev 32344)
+++ trunk/blender/source/blender/collada/ArmatureExporter.cpp	2010-10-06 12:04:56 UTC (rev 32345)
@@ -35,7 +35,7 @@
 #include "BKE_action.h"
 #include "BKE_armature.h"
 
-#include "BLI_listBase.h"
+#include "BLI_listbase.h"
 
 #include "GeometryExporter.h"
 #include "ArmatureExporter.h"

Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp	2010-10-06 11:02:44 UTC (rev 32344)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp	2010-10-06 12:04:56 UTC (rev 32345)
@@ -186,7 +186,7 @@
 {
 	ForEachMaterialFunctor<Functor> matfunc(&f);
 	GeometryFunctor gf;
-	gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor>>(sce, matfunc);
+	gf.forEachMeshObjectInScene<ForEachMaterialFunctor<Functor> >(sce, matfunc);
 }
 
 // OB_MESH is assumed

Modified: trunk/blender/source/blender/collada/MeshImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MeshImporter.cpp	2010-10-06 11:02:44 UTC (rev 32344)
+++ trunk/blender/source/blender/collada/MeshImporter.cpp	2010-10-06 12:04:56 UTC (rev 32345)
@@ -24,6 +24,10 @@
 
 #include <algorithm>
 
+#ifndef WIN32
+#include <iostream>
+#endif
+
 #include "COLLADAFWMeshPrimitive.h"
 #include "COLLADAFWMeshVertexData.h"
 #include "COLLADAFWPolygons.h"
@@ -904,4 +908,4 @@
 	mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL);
 
 	return true;
-}
\ No newline at end of file
+}

Modified: trunk/blender/source/blender/collada/SkinInfo.cpp
===================================================================
--- trunk/blender/source/blender/collada/SkinInfo.cpp	2010-10-06 11:02:44 UTC (rev 32344)
+++ trunk/blender/source/blender/collada/SkinInfo.cpp	2010-10-06 12:04:56 UTC (rev 32345)
@@ -24,6 +24,10 @@
 
 #include <algorithm>
 
+#ifndef WIN32
+#include <stdint.h>
+#endif
+
 #include "BKE_object.h"
 #include "DNA_armature_types.h"
 #include "DNA_modifier_types.h"