diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-11-23 20:38:07 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-11-23 20:38:19 +0300 |
| commit | 7eb9091e96f4db4fbea03d52c1cc140862723f14 (patch) | |
| tree | 7c82a7c6742b234ac7ba37d21bf6264c06fa8750 /source/blender/collada | |
| parent | b9b50c0e396fd6304ddc6fef36805102362dd319 (diff) | |
fix: compiler errors on mac_x86_64_10_9
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationImporter.h | 2 | ||||
| -rw-r--r-- | source/blender/collada/MaterialExporter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/collada/AnimationImporter.h index 4fa4864cbb0..2e9f69ea8cb 100644 --- a/source/blender/collada/AnimationImporter.h +++ b/source/blender/collada/AnimationImporter.h @@ -182,7 +182,7 @@ public: // prerequisites: // animlist_map - map animlist id -> animlist // curve_map - map anim id -> curve(s) - Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node, + Object *translate_animation_OLD(COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Object *>& object_map, std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>& root_map, COLLADAFW::Transformation::TransformationType tm_type, diff --git a/source/blender/collada/MaterialExporter.h b/source/blender/collada/MaterialExporter.h index 3fef7025417..171c05fcea7 100644 --- a/source/blender/collada/MaterialExporter.h +++ b/source/blender/collada/MaterialExporter.h @@ -44,7 +44,7 @@ extern "C" { #include "GeometryExporter.h" #include "collada_internal.h" #include "ExportSettings.h" -#include "materials.h" +#include "Materials.h" class MaterialsExporter: COLLADASW::LibraryMaterials { |