diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-06-12 23:37:30 +0400 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-06-12 23:37:30 +0400 |
commit | 7fec7070d7fcf7bde53768e555b40b57ef4a7552 (patch) | |
tree | 5e5bc914b51291b5abc22cbdf46e05a20194db33 | |
parent | 72c668a84adfe0c683e2cf03a3ad78172dbc6276 (diff) |
fix: Collada build warning about inconsistent usage of Camera structure/class
-rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 69f302eaec7..e224ffce731 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -27,6 +27,40 @@ #include <stdlib.h> #include <stdio.h> #include <math.h> +#include <vector> +#include <algorithm> // std::find + +#include "COLLADASWCamera.h" +#include "COLLADASWAsset.h" +#include "COLLADASWLibraryVisualScenes.h" +#include "COLLADASWNode.h" +#include "COLLADASWSource.h" +#include "COLLADASWInstanceGeometry.h" +#include "COLLADASWInputList.h" +#include "COLLADASWPrimitves.h" +#include "COLLADASWVertices.h" +#include "COLLADASWLibraryAnimations.h" +#include "COLLADASWLibraryImages.h" +#include "COLLADASWLibraryEffects.h" +#include "COLLADASWImage.h" +#include "COLLADASWEffectProfile.h" +#include "COLLADASWColorOrTexture.h" +#include "COLLADASWParamTemplate.h" +#include "COLLADASWParamBase.h" +#include "COLLADASWSurfaceInitOption.h" +#include "COLLADASWSampler.h" +#include "COLLADASWScene.h" +#include "COLLADASWTechnique.h" +#include "COLLADASWTexture.h" +#include "COLLADASWLibraryMaterials.h" +#include "COLLADASWBindMaterial.h" +#include "COLLADASWInstanceCamera.h" +#include "COLLADASWInstanceLight.h" +#include "COLLADASWConstants.h" +#include "COLLADASWLibraryControllers.h" +#include "COLLADASWInstanceController.h" +#include "COLLADASWInstanceNode.h" +#include "COLLADASWBaseInputElement.h" extern "C" { @@ -54,7 +88,6 @@ extern "C" #ifdef WITH_BUILDINFO extern char build_rev[]; #endif -} #include "MEM_guardedalloc.h" @@ -74,37 +107,7 @@ extern char build_rev[]; #include "BLI_listbase.h" #include "RNA_access.h" - -#include "COLLADASWAsset.h" -#include "COLLADASWLibraryVisualScenes.h" -#include "COLLADASWNode.h" -#include "COLLADASWSource.h" -#include "COLLADASWInstanceGeometry.h" -#include "COLLADASWInputList.h" -#include "COLLADASWPrimitves.h" -#include "COLLADASWVertices.h" -#include "COLLADASWLibraryAnimations.h" -#include "COLLADASWLibraryImages.h" -#include "COLLADASWLibraryEffects.h" -#include "COLLADASWImage.h" -#include "COLLADASWEffectProfile.h" -#include "COLLADASWColorOrTexture.h" -#include "COLLADASWParamTemplate.h" -#include "COLLADASWParamBase.h" -#include "COLLADASWSurfaceInitOption.h" -#include "COLLADASWSampler.h" -#include "COLLADASWScene.h" -#include "COLLADASWTechnique.h" -#include "COLLADASWTexture.h" -#include "COLLADASWLibraryMaterials.h" -#include "COLLADASWBindMaterial.h" -#include "COLLADASWInstanceCamera.h" -#include "COLLADASWInstanceLight.h" -#include "COLLADASWConstants.h" -#include "COLLADASWLibraryControllers.h" -#include "COLLADASWInstanceController.h" -#include "COLLADASWInstanceNode.h" -#include "COLLADASWBaseInputElement.h" +} #include "collada_internal.h" #include "DocumentExporter.h" @@ -124,8 +127,6 @@ extern char build_rev[]; #include "LightExporter.h" #include "MaterialExporter.h" -#include <vector> -#include <algorithm> // std::find char *bc_CustomData_get_layer_name(const struct CustomData *data, int type, int n) { |