diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 3 | ||||
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 3 | ||||
-rw-r--r-- | source/blender/collada/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/blender/collada/MeshImporter.cpp | 3 | ||||
-rw-r--r-- | source/blender/collada/SkinInfo.cpp | 3 | ||||
-rw-r--r-- | source/blender/collada/TransformReader.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/collada.cpp | 3 | ||||
-rw-r--r-- | source/blender/collada/collada_internal.cpp | 1 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 3 |
9 files changed, 26 insertions, 0 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index d462042b3f6..836c1fae5df 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -22,6 +22,9 @@ * ***** END GPL LICENSE BLOCK ***** */ +/* COLLADABU_ASSERT, may be able to remove later */ +#include "COLLADABUPlatform.h" + #include "DNA_armature_types.h" #include "ED_keyframing.h" diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 0dae0b6b9cb..e78c1950d33 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -22,6 +22,9 @@ * ***** END GPL LICENSE BLOCK ***** */ +/* COLLADABU_ASSERT, may be able to remove later */ +#include "COLLADABUPlatform.h" + #include <algorithm> #include "COLLADAFWUniqueId.h" diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 3a2c085335b..ce204013f3d 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -99,4 +99,9 @@ if(WITH_BUILDINFO) add_definitions(-DNAN_BUILDINFO) endif() +if(CMAKE_COMPILER_IS_GNUCXX) + # COLLADAFWArray.h gives error with gcc 4.5 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") +endif() + blender_add_lib(bf_collada "${SRC}" "${INC}") diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 5faaf123bc7..b42adc03785 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -28,6 +28,9 @@ #include <iostream> #endif +/* COLLADABU_ASSERT, may be able to remove later */ +#include "COLLADABUPlatform.h" + #include "COLLADAFWMeshPrimitive.h" #include "COLLADAFWMeshVertexData.h" #include "COLLADAFWPolygons.h" diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp index 8d342daf486..4c6713736fb 100644 --- a/source/blender/collada/SkinInfo.cpp +++ b/source/blender/collada/SkinInfo.cpp @@ -28,6 +28,9 @@ #include <stdint.h> #endif +/* COLLADABU_ASSERT, may be able to remove later */ +#include "COLLADABUPlatform.h" + #include "BKE_object.h" #include "DNA_armature_types.h" #include "DNA_modifier_types.h" diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp index 814fda58e3c..10481fcafbe 100644 --- a/source/blender/collada/TransformReader.cpp +++ b/source/blender/collada/TransformReader.cpp @@ -21,6 +21,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ +/* COLLADABU_ASSERT, may be able to remove later */ +#include "COLLADABUPlatform.h" #include "TransformReader.h" diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp index d040e99c4b9..241b63eeade 100644 --- a/source/blender/collada/collada.cpp +++ b/source/blender/collada/collada.cpp @@ -22,6 +22,9 @@ * ***** END GPL LICENSE BLOCK ***** */ +/* COLLADABU_ASSERT, may be able to remove later */ +#include "COLLADABUPlatform.h" + #include "DocumentExporter.h" #include "DocumentImporter.h" diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index 4943aa96546..80c8a470888 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -22,6 +22,7 @@ * ***** END GPL LICENSE BLOCK ***** */ +/* COLLADABU_ASSERT, may be able to remove later */ #include "collada_internal.h" UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) {} diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index b6451c58a01..c61f8cda349 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -22,6 +22,9 @@ * ***** END GPL LICENSE BLOCK ***** */ +/* COLLADABU_ASSERT, may be able to remove later */ +#include "COLLADABUPlatform.h" + #include "COLLADAFWGeometry.h" #include "COLLADAFWMeshPrimitive.h" #include "COLLADAFWMeshVertexData.h" |