Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 24 May 2018 14:44:26 +0000 (16:44 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 24 May 2018 14:44:26 +0000 (16:44 +0200)
commitd638ad3b20577101cffedca069222b219e71b14f
treebcd820cfae65052686420fb5570ce871ca015aa0
parent5505ba8d4753ee6b3c0101ba3e4abf337546a1b0
parent8d9faf840b8f99255b9989d178e5e4a6f5ec7f87
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_screen.h
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_ops.c