Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 9 Feb 2018 15:26:05 +0000 (16:26 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 9 Feb 2018 15:26:05 +0000 (16:26 +0100)
1  2 
source/blender/editors/space_file/space_file.c