Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2018 13:50:54 +0000 (15:50 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2018 13:50:54 +0000 (15:50 +0200)
commite6609deba2b601bbd22d17c246eab2265ccd20a1
treea47808453439ae8199bf5d37d2fe27d3852f12c8
parent12e926781a2ea332cb6c0c0e7b32b31c1aea27c5
parent372754c164793e8e1b0d8a7f1f0dbe9fd432fdf3
Merge branch 'master' into blender2.8
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_intern.h
source/blender/editors/screen/screen_ops.c