Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 16 Mar 2017 16:28:04 +0000 (17:28 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 16 Mar 2017 16:28:04 +0000 (17:28 +0100)
commite2df9ab386fbeaf8220a64aca530641187967842
treef9d032f87eae63fda7717ad7aa2bc13d8c099d52
parentfc61cdf1428dc74f4ef9b834de9082f910ce08e0
parent1f65ab606bcaa6ef60a9e7c9b08b134d46c25e42
Merge branch 'master' into blender2.8
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_tools.c