Merge branch 'master' into blender2.8

2018-06-07 16:45:10 +02:00
parent fcc5d7c29e 863e395ad8
commit f0815b1322
20 changed files with 674 additions and 674 deletions
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -142,7 +142,7 @@ enum {
 struct wmWindow	*WM_window_open(struct bContext *C, const struct rcti *rect);
 struct wmWindow *WM_window_open_temp(struct bContext *C, int x, int y, int sizex, int sizey, int type);
 void             WM_window_set_dpi(wmWindow *win);
-			
+
 bool		WM_stereo3d_enabled(struct wmWindow *win, bool only_fullscreen_test);