Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 9 Feb 2018 16:24:23 +0000 (17:24 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 9 Feb 2018 16:24:23 +0000 (17:24 +0100)
1  2 
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_window.c