Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 24 Aug 2018 01:54:12 +0000 (11:54 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 24 Aug 2018 01:54:12 +0000 (11:54 +1000)
commit5bd731b6730b6dc31dad7c3e8ccf0555b7bed3f1
treee8fe4602249dcf1ee77bf17eefa678cb09b23db7
parent0cf12dfc14f8312d9fe9db1d512dfb55104f6ac6
parent7ec1a56a41953eac23e252fad9a3bf1605471abc
Merge branch 'master' into blender2.8
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_layout.c
source/blender/makesrna/intern/rna_ui_api.c