diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-15 22:01:18 +0400 |
| commit | 816377cc02fe5dd4be945c0f3d415861114b4980 (patch) | |
| tree | 306e9d1363aa66bc919e43b80b3380fab9f60ea9 /source/gameengine/Converter/KX_ConvertActuators.cpp | |
| parent | c8af263e5d8d9d41a757e8438cdcf3b64d57e0c0 (diff) | |
| parent | ee768ada680ce0a8aa184c882005c0ef1c0140fb (diff) | |
Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (`svn status` output: http://www.pasteall.org/7887).soc-2009-kazanbas
The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas
Diffstat (limited to 'source/gameengine/Converter/KX_ConvertActuators.cpp')
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertActuators.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp index 91a39bd7686..07f6f628e06 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.cpp +++ b/source/gameengine/Converter/KX_ConvertActuators.cpp @@ -396,7 +396,7 @@ void BL_ConvertActuators(char* maggiename, "\" has no sound datablock." << std::endl; } else - snd_sound = sound->cache ? sound->cache : sound->handle; + snd_sound = sound->cache ? sound->cache : sound->snd_sound; KX_SoundActuator* tmpsoundact = new KX_SoundActuator(gameobj, snd_sound, |