Merge remote-tracking branch 'origin'

Conflicts: code/C4DImporter.cpp code/OgreImporter.h
2015-04-16 01:03:00 +02:00
parent bf4913b5c9 c95d32564c
commit 8c45a4dc3b
95 changed files with 32460 additions and 9658 deletions
@@ -236,7 +236,7 @@ IfcVector3 TempMesh::ComputeLastPolygonNormal(bool normalize) const

 struct CompareVector
 {
-	bool operator () (const IfcVector3& a, const IfcVector3& b)
+	bool operator () (const IfcVector3& a, const IfcVector3& b) const
 	{
 		IfcVector3 d = a - b;
 		IfcFloat eps = 1e-6;