[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30303] trunk/blender/source/blender/ blenloader/intern/readfile.c: Merging revision 30301: 30302 from my GSoC branch to trunk, log:

[Joerg Mueller]

Revision: 30303
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30303
Author:   nexyon
Date:     2010-07-14 10:55:08 +0200 (Wed, 14 Jul 2010)

Log Message:
-----------
Merging revision 30301:30302 from my GSoC branch to trunk, log:
Fixed error in 2.4x sound conversion.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30301

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-07-14 08:52:06 UTC (rev 30302)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-07-14 08:55:08 UTC (rev 30303)
@@ -9684,7 +9684,7 @@
 					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;