Merge branch 'blender2.8' into render-layers
authorJulian Eisel <eiseljulian@gmail.com>
Mon, 6 Feb 2017 15:35:42 +0000 (16:35 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Mon, 6 Feb 2017 15:35:42 +0000 (16:35 +0100)
commit6714f6ae2f78e1de53ff4a2916d7046485556509
treed0ac43cd119732ddeb77b15b06d5de515ab077a2
parent6d4f75a123cdbc33d83b61e46b7bd2ede6cc0fe9
parente58359c26f2b68b04b28cbcd69c53f19818aa5e1
Merge branch 'blender2.8' into render-layers
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_view3d/view3d_draw.c