Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-11-04 16:46:48 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-11-04 16:46:48 +0400
commit9bdfa2f9e7f6c71a58b5e7875f27971768acc0e1 (patch)
treed682cc7afbd5947466853e74171680c3ddc65364 /source/blender/editors/space_file/filelist.c
parentdd8e83606776d1d3c51cd8f5c89bf6d1a7e05f74 (diff)
parent2a8ce1f12162593ad9c1db3422d35530c5d05dc2 (diff)
Merged changes in the trunk up to revision 51863.
Diffstat (limited to 'source/blender/editors/space_file/filelist.c')
-rw-r--r--source/blender/editors/space_file/filelist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 0b5f636cedd..c24447f16c3 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -785,7 +785,7 @@ static int file_extension_type(const char *relname)
}
else if (BLI_testextensie(relname, ".txt") ||
BLI_testextensie(relname, ".glsl") ||
- BLI_testextensie(relname, ".osl") ||
+ BLI_testextensie(relname, ".osl") ||
BLI_testextensie(relname, ".data"))
{
return TEXTFILE;