Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 12 Jun 2018 15:36:24 +0000 (17:36 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 12 Jun 2018 15:36:24 +0000 (17:36 +0200)
commit031416c5590828e68090b9e6a10d96a70d537421
tree8f8a3bee5e9b1c5d859024e889dec23db65cb42f
parente8dd4cd9cabb76f00838a975627c571a4fccdb18
parentb00d84035989d3cef3417ee4f2ca8475c6c2b57a
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/intern/screen.c
source/blender/editors/screen/area.c
source/blender/python/intern/bpy_rna_callback.c