Merge branch 'master' into blender2.8

2018-02-18 22:33:05 +11:00
parent 5d3f679013 7ff3cd2693
commit 2bc952fdb6
81 changed files with 683 additions and 972 deletions
--- a/source/blender/python/mathutils/mathutils_bvhtree.c
+++ b/source/blender/python/mathutils/mathutils_bvhtree.c
@@ -33,7 +33,7 @@

 #include "BLI_utildefines.h"
 #include "BLI_kdopbvh.h"
-#include "BLI_polyfill2d.h"
+#include "BLI_polyfill_2d.h"
 #include "BLI_math.h"
 #include "BLI_ghash.h"
 #include "BLI_memarena.h"