Merge branch 'master' into issue_1660

2018-01-16 17:13:02 +01:00
parent d230635ff6 48d6006fea
commit 81fbe2c7d3
529 changed files with 471329 additions and 464383 deletions
--- a/code/STLLoader.cpp
+++ b/code/STLLoader.cpp
@@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 // internal headers
 #include "STLLoader.h"
-#include "ParsingUtils.h"
-#include "fast_atof.h"
+#include <assimp/ParsingUtils.h>
+#include <assimp/fast_atof.h>
 #include <memory>
 #include <assimp/IOSystem.hpp>
 #include <assimp/scene.h>