Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2018 08:32:16 +0000 (10:32 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2018 08:32:16 +0000 (10:32 +0200)
commit66263905ae8b4372e0e103679dbcb07c8fb7420f
tree298b36689e75db2c93fd9660f18e3197b4adbbff
parent00d52376f7d78674acc9feb9dbbdbc3d96b2932a
parentf1bc9331b152cbe23d54dd01dc83871d07055477
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface_handlers.c
source/blender/windowmanager/intern/wm_event_system.c