diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-06 17:55:50 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-06 17:55:50 +0400 |
commit | ca44eb3abd4ac2729c0d276b561ed2d3b49efe3f (patch) | |
tree | 4f8aa951ab20742726a96b5267ed3332e32a8809 /source | |
parent | 0d815d3528912eede6ee90f3a12435cbcca1eb04 (diff) |
GCC fixes for r32346
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 7 | ||||
-rw-r--r-- | source/blender/collada/MaterialExporter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/MaterialExporter.h | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index f93a8ef72cd..06df94416b3 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -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 diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp index e873227745c..66ebe2d9ed8 100644 --- a/source/blender/collada/MaterialExporter.cpp +++ b/source/blender/collada/MaterialExporter.cpp @@ -25,8 +25,6 @@ #include "COLLADABUUtils.h" -#include "BKE_material.h" - #include "MaterialExporter.h" #include "collada_internal.h" diff --git a/source/blender/collada/MaterialExporter.h b/source/blender/collada/MaterialExporter.h index 35aaaad43fd..972cd8bd8e5 100644 --- a/source/blender/collada/MaterialExporter.h +++ b/source/blender/collada/MaterialExporter.h @@ -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 { |