[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32347] trunk/blender/source/blender/ collada: GCC fixes for r32346

[Nathan Letwory]

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

Log Message:
-----------
GCC fixes for r32346

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

Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp	2010-10-06 13:21:08 UTC (rev 32346)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp	2010-10-06 13:55:50 UTC (rev 32347)
@@ -102,15 +102,16 @@
 #include "collada_internal.h"
 #include "DocumentExporter.h"
 
+// can probably go after refactor is complete
+#include "InstanceWriter.h"
+#include "TransformWriter.h"
+
 #include "ArmatureExporter.h"
 #include "CameraExporter.h"
 #include "GeometryExporter.h"
 #include "LightExporter.h"
 #include "MaterialExporter.h"
 
-// can probably go after refactor is complete
-#include "InstanceWriter.h"
-#include "TransformWriter.h"
 
 #include <vector>
 #include <algorithm> // std::find

Modified: trunk/blender/source/blender/collada/MaterialExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MaterialExporter.cpp	2010-10-06 13:21:08 UTC (rev 32346)
+++ trunk/blender/source/blender/collada/MaterialExporter.cpp	2010-10-06 13:55:50 UTC (rev 32347)
@@ -25,8 +25,6 @@
 
 #include "COLLADABUUtils.h"
 
-#include "BKE_material.h"
-
 #include "MaterialExporter.h"
 #include "collada_internal.h"
 

Modified: trunk/blender/source/blender/collada/MaterialExporter.h
===================================================================
--- trunk/blender/source/blender/collada/MaterialExporter.h	2010-10-06 13:21:08 UTC (rev 32346)
+++ trunk/blender/source/blender/collada/MaterialExporter.h	2010-10-06 13:55:50 UTC (rev 32347)
@@ -26,14 +26,20 @@
 #ifndef __MATERIALEXPORTER_H__
 #define __MATERIALEXPORTER_H__
 
+#include <string>
+#include <vector>
+
 #include "COLLADASWLibraryMaterials.h"
 #include "COLLADASWStreamWriter.h"
 
+#include "BKE_material.h"
+
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "GeometryExporter.h"
+#include "collada_internal.h"
 
 class MaterialsExporter: COLLADASW::LibraryMaterials
 {