Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 30 May 2018 14:32:49 +0000 (16:32 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 30 May 2018 14:32:49 +0000 (16:32 +0200)
commit92e3b3839b11e66730cf53ead260fa2a4bec9118
treefa95dd91f046c803c4a08b50daf42ff57cb2030a
parentf1f1c3284950902f7597931bd1044f085d2ef634
parent10a2562bc5d4c873bbe58e4aa3d19522080d1f2b
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_intern.h