Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 9 May 2018 09:25:35 +0000 (11:25 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 9 May 2018 09:25:35 +0000 (11:25 +0200)
commit0d4b165d4f2091708a086bffd5f5223e7135af11
treed58807b47dfd354b9dcb00d7cd39bafb94a2ef74
parent1cbe3b6e0388b27c7866fd1e97230551ec4032f1
parentb59b8124001182a40bf4aa271591d589b2d46cfa
Merge branch 'master' into blender2.8
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/intern/wm_init_exit.c