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)
commit7e3e542aaba1a4e230b01fd9109471d28a9f9487
treecaa5c0edda24f3ba8b958e68e45bb7477c97b090
parentbe4ebb7fa6c4b0678803c75d20c080e0b1db4877
parentea9099473a545ae1992ae0fbc4ba0bf09cff1bd9
Merge branch 'master' into blender2.8
source/blender/editors/space_file/space_file.c