Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 10:38:24 +0000 (12:38 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 10:38:46 +0000 (12:38 +0200)
commit2ead3f0765a15cce5367c4701539b6900299a97f
tree33e19ee236bfce6e7136542103e22763531a6597
parentc7c7bfae75e82ee2121be133b3cc4b297146a026
parent8ff3f7f6013f730f5325dbcbbfcb4e78fae19bbb
Merge branch 'master' into blender2.8
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operator_type.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/wm.h