Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 May 2018 05:53:48 +0000 (07:53 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 May 2018 05:53:48 +0000 (07:53 +0200)
commit6f57d12e2e4a7d0e094bdfeb56cadd752fbe6207
treed98f6a50cbf959e3d5a97e799c296df845c3311c
parent05ec0108dca544785ae55cbe847eaa058457df3d
parent433aaa8c2e8db5c8f65a8942c59d66d99d5fa340
Merge branch 'master' into blender2.8
source/blender/windowmanager/WM_types.h