Merge branch 'master' into blender2.8

2017-01-16 20:50:10 +01:00
parent af9e99763c e0303d0297
commit 43872f59b9
90 changed files with 1259 additions and 694 deletions
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -31,8 +31,8 @@

 #include "BLI_listbase.h"
 #include "BLI_math.h"
-#include "BLI_path_util.h"
 #include "BLI_string.h"
+#include "BLI_string_utils.h"

 #include "ED_screen.h"
 #include "ED_view3d.h"