diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-07-14 12:55:08 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-07-14 12:55:08 +0400 |
| commit | e7877979af44da1662a6f908bd8b41de8e6abe14 (patch) | |
| tree | 443d27f044fed873666cbd99ea13e1e42e72c7d6 /source | |
| parent | 935ca611c30c1a2c5efb30d68f240b59de71febf (diff) | |
Merging revision 30301:30302 from my GSoC branch to trunk, log:
Fixed error in 2.4x sound conversion.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 7f24c416526..f6122161130 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9684,7 +9684,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if(sAct->sound) { sound = newlibadr(fd, lib, sAct->sound); - sAct->flag = sound->flags | SOUND_FLAGS_3D ? ACT_SND_3D_SOUND : 0; + sAct->flag = sound->flags & SOUND_FLAGS_3D ? ACT_SND_3D_SOUND : 0; sAct->pitch = sound->pitch; sAct->volume = sound->volume; sAct->sound3D.reference_distance = sound->distance; |