Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Fri, 17 Mar 2017 14:34:35 +0000 (15:34 +0100)
committerJulian Eisel <eiseljulian@gmail.com>
Fri, 17 Mar 2017 14:38:45 +0000 (15:38 +0100)
commita96008f3aae2b047ce777418e45eeae09e0ea4e6
treee9a227675344d3fe5367a62835f529633c363a40
parent4b190e312f251d9e519c84af1dc5c65f3ab3a4fd
parent9d873fc3debe03e87eb514f51fddf29ee76983b3
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/screen/area.c
source/blender/editors/space_outliner/outliner_draw.c