GCC fixes for r32346
authorNathan Letwory <nathan@letworyinteractive.com>
Wed, 6 Oct 2010 13:55:50 +0000 (13:55 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Wed, 6 Oct 2010 13:55:50 +0000 (13:55 +0000)
source/blender/collada/DocumentExporter.cpp
source/blender/collada/MaterialExporter.cpp
source/blender/collada/MaterialExporter.h

index f93a8ef72cdee20a79777f91b106e235c6458d56..06df94416b3034ac72064bd6ce36f2bc96766320 100644 (file)
@@ -102,15 +102,16 @@ extern char build_rev[];
 #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
index e873227745cbf8848190587bad8a1b681abf1480..66ebe2d9ed82911284e6d38bdc6eb8f908928f24 100644 (file)
@@ -25,8 +25,6 @@
 
 #include "COLLADABUUtils.h"
 
-#include "BKE_material.h"
-
 #include "MaterialExporter.h"
 #include "collada_internal.h"
 
index 35aaaad43fd55a0392e2db0a67851b1680049932..972cd8bd8e52447face65f643f44542c0790f0bd 100644 (file)
 #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
 {