Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Sun, 16 Oct 2016 13:33:00 +0000 (15:33 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Sun, 16 Oct 2016 13:33:00 +0000 (15:33 +0200)
commitb557ceb2c1544d1b5b584a0bf7bb5028b818fd2c
treecffd52d9df3a8995d735e89871e40bdf8b4a341f
parent9a9a663f40d55e1f94d23029ed3962b21f8aaca2
parentd59079c5e1b40cfd650cf470ef223928bd304e8f
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_outliner/outliner_tree.c