Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2018 12:41:14 +0000 (14:41 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Jul 2018 12:41:52 +0000 (14:41 +0200)
commit79dabc537e3e345c3e536a6369b1d130942155c3
treef590f04ff819c33d0b9185f4a361f92ad79404c1
parentb0c32818ba401a81c18f89f931d4336d8e859bc2
parent3527857cdca1f5d07037f20fed9840efe1954a57
Merge branch 'master' into blender2.8
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_ops.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c