Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 9 May 2018 08:02:33 +0000 (10:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 9 May 2018 08:02:33 +0000 (10:02 +0200)
commita92557f77b46784bb2631981fbf9fd67468419d1
treec7c1e0610d6b76aac0db873cad78e54c3a8f7f3e
parent2d2875fc158d2fbcade1d335f2ca3921cb65d87e
parent598216c36e2461ddcaa7dd72e4d50691710c4647
Merge branch 'master' into blender2.8
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/intern/wm_init_exit.c