Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 3 Jun 2018 15:09:07 +0000 (17:09 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 3 Jun 2018 15:09:07 +0000 (17:09 +0200)
commit81dbf08eb49da22576c9b444b9199e6264c7bfe1
treed4fb6b22e4396e0c3a61dc1517f4f78f7c04dc02
parent25ff7a4f2a753067aa2a0fdd2730a2ad1264821a
parent38eb91c848a967ae890d8ca5d7e3de1d48df8db2
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_screen.h
source/blender/makesdna/DNA_space_types.h