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:
authorNathan Letwory <nathan@letworyinteractive.com>2010-10-16 19:00:04 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-10-16 19:00:04 +0400
commit53ced0be29c2672226d16d63118a02a4c8eee342 (patch)
tree2534658b1f5ccaa6b686503ff22c70ee9a7cac3b
parent03eb8d02229843c3257076c00a8f51925f3c93a6 (diff)
Now sound init param removal revert should be fine (apparently my cmake project files missed rebuild hint for these, fortunately SCons did its job well).
-rw-r--r--source/blender/windowmanager/intern/wm_files.c2
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_Application.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index e925d651490..66d2a1efdea 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -254,7 +254,7 @@ static void wm_init_userdef(bContext *C)
UI_init_userdef();
MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024);
- sound_init();
+ sound_init(CTX_data_main(C));
/* set the python auto-execute setting from user prefs */
/* disabled by default, unless explicitly enabled in the command line */
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index 3a302fbc7ff..d1b8fb12336 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -583,7 +583,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
if (!m_networkdevice)
goto initFailed;
- sound_init();
+ sound_init(m_maggie);
// create a ketsjisystem (only needed for timing and stuff)
m_kxsystem = new GPG_System (m_system);