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)
commit7978306cbb3edf700e43762f44d680f07c595373
tree3e1892ff15c88357d9cc845a4842c61e818cbcd7
parent7e3e542aaba1a4e230b01fd9109471d28a9f9487
parent3ab5ef7b4f34f110e4861096428b83b4f9b5efe9
Merge branch 'master' into blender2.8
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_window.c