diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-17 02:49:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-08-17 02:49:17 +0400 |
| commit | 594121016d498757f6d9195d32b001e6bc7501ad (patch) | |
| tree | 5b0c63140f347047a83a47e9669c8dee3efc4b36 /source/blender/blenkernel | |
| parent | fcce333a0888ed025bce41d27647bc5f80d6453b (diff) | |
2.5
* Use scene->r.audio instead of scene->audio everywhere, was using both still.
* Fix time_top_left_3dwindow link error, not sure why this happens, somehow
with scons building it seems that files (like time_header.c) wich are not
called from the same .a module get stripped?
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 1138f805538..f1727cc6b59 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -403,7 +403,7 @@ Scene *add_scene(char *name) pset->brush[PE_BRUSH_CUT].strength= 100; sce->jumpframe = 10; - sce->audio.mixrate = 44100; + sce->r.audio.mixrate = 44100; strcpy(sce->r.backbuf, "//backbuf"); strcpy(sce->r.pic, U.renderdir); diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 03123a4e577..a3275792a85 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -416,7 +416,7 @@ void sound_scrub(struct bContext *C) int cfra = CFRA; float fps = FPS; - if(scene->audio.flag & AUDIO_SCRUB && !CTX_wm_screen(C)->animtimer) + if(scene->r.audio.flag & AUDIO_SCRUB && !CTX_wm_screen(C)->animtimer) { AUD_lock(); |