[Bf-blender-cvs] [7eb9091e96f] blender2.8: fix: compiler errors on mac_x86_64_10_9

Gaia Clary noreply at git.blender.org
Fri Nov 23 18:38:30 CET 2018


Commit: 7eb9091e96f4db4fbea03d52c1cc140862723f14
Author: Gaia Clary
Date:   Fri Nov 23 18:38:07 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB7eb9091e96f4db4fbea03d52c1cc140862723f14

fix: compiler errors on mac_x86_64_10_9

===================================================================

M	source/blender/collada/AnimationImporter.h
M	source/blender/collada/MaterialExporter.h

===================================================================

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
 {



More information about the Bf-blender-cvs mailing list