Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2018 10:54:21 +0000 (12:54 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2018 10:54:21 +0000 (12:54 +0200)
commit47f2b3b80d748ccfe1192dbd7c3176be88814da1
tree46d16d5081bd1e9faf8aab27815b89cf4026da4a
parent4ca4e64d25f69eb4cbb96084fb688b69484e1507
parent56254a42e0aa42a39e1f3f7b3d13905168c3f39c
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface_layout.c