Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2018 13:40:14 +0000 (15:40 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Jun 2018 13:40:14 +0000 (15:40 +0200)
commit12e926781a2ea332cb6c0c0e7b32b31c1aea27c5
tree809a87f7cc77b7cae8b5df252004e9ef578d5e0c
parent3df5625ae73268df1967e704531cf19af1e59d9f
parent5cad6afac663b05819f5e5a887ec31515a2cf16c
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