Merge branch 'master' of https://github.com/ultimaker/curaengine

.gitignore

@@ -54,6 +54,9 @@ nbproject/*
 *.depend
 .*.swp
 .vs
+.cproject
+.project
+.settings
 
 ## Documentation.
 documentation/html/*

src/MeshGroup.cpp

@@ -280,6 +280,7 @@ bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const char* filename, const FMa
             return true;
         }
     }
+    logWarning("Unable to recognize the extension of the file. Currently only .stl and .STL are supported.");
     return false;
 }
 

src/raft.cpp

@@ -1,7 +1,7 @@
 //Copyright (c) 2018 Ultimaker B.V.
 //CuraEngine is released under the terms of the AGPLv3 or higher.
 
-#include <clipper.hpp>
+#include "clipper.hpp"
 
 #include "Application.h" //To get settings.
 #include "ExtruderTrain.h"

src/utils/Coord_t.h

@@ -6,7 +6,7 @@
 
 
 //Include Clipper to get the ClipperLib::IntPoint definition, which we reuse as Point definition.
-#include <clipper.hpp>
+#include "clipper.hpp"
 
 namespace cura
 {

src/utils/IntPoint.h

@@ -11,7 +11,7 @@ Integer points are used to avoid floating point rounding errors, and because Cli
 #define INLINE static inline
 
 //Include Clipper to get the ClipperLib::IntPoint definition, which we reuse as Point definition.
-#include <clipper.hpp>
+#include "clipper.hpp"
 #include <cmath>
 #include <functional> // for hash function object
 #include <iostream> // auto-serialization / auto-toString()

src/utils/polygon.h

@@ -7,7 +7,7 @@
 #include <vector>
 #include <assert.h>
 #include <float.h>
-#include <clipper.hpp>
+#include "clipper.hpp"
 
 #include <algorithm>    // std::reverse, fill_n array
 #include <cmath> // fabs