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)
1  2 
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_tools.c