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
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/CMakeLists.txt1
-rw-r--r--source/blender/blenloader/intern/writefile.c2
-rw-r--r--source/blender/editors/space_file/filelist.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 269fe2b325d..db9bbfcc5e7 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -35,7 +35,6 @@ SET(INC
../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
../../../intern/bsp/extern
../../../intern/audaspace
- ${SDL_INC}
${ZLIB_INC}
)
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 5e2ef5a534b..73b7158035a 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2140,8 +2140,6 @@ static void write_sounds(WriteData *wd, ListBase *idbase)
PackedFile * pf;
- // set all samples to unsaved status
-
sound= idbase->first;
while(sound) {
if(sound->id.us>0 || wd->current) {
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index e27385b3bfb..538c1e4fce7 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -848,6 +848,7 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
|| BLI_testextensie(file->relname, ".ac3")
|| BLI_testextensie(file->relname, ".aac")
|| BLI_testextensie(file->relname, ".flac")
+ || BLI_testextensie(file->relname, ".wma")
|| BLI_testextensie(file->relname, ".eac3")) {
file->flags |= SOUNDFILE;
}
@@ -891,6 +892,7 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
|| BLI_testextensie(file->relname, ".ac3")
|| BLI_testextensie(file->relname, ".aac")
|| BLI_testextensie(file->relname, ".flac")
+ || BLI_testextensie(file->relname, ".wma")
|| BLI_testextensie(file->relname, ".eac3")) {
file->flags |= SOUNDFILE;
}