diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-05 01:34:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-05 01:34:17 +0400 |
| commit | d3e35f096811dced93cc213392db43b7cb426a29 (patch) | |
| tree | 4448600456ec57a7e78f096befb1c024f633814c /source/blender | |
| parent | a49020b2414005cc7aef06749ff1f9c1c7e75a3f (diff) | |
2.5: increase subversion to init new sound userpref variables.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 12 |
3 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 42ee11587a7..d60737d62fe 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -43,7 +43,7 @@ struct bContext; struct ReportList; #define BLENDER_VERSION 250 -#define BLENDER_SUBVERSION 2 +#define BLENDER_SUBVERSION 3 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 0231d841c2b..5a628192af6 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9686,16 +9686,6 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead) bfd->user->uifonts.first= bfd->user->uifonts.last= NULL; bfd->user->uistyles.first= bfd->user->uistyles.last= NULL; - // AUD_XXX that's bad because if the user has saved No Audio, it changes to OpenAL always - if(bfd->user->audiochannels == 0) - bfd->user->audiochannels = 2; - if(bfd->user->audiodevice == 0) - bfd->user->audiodevice = 2; - if(bfd->user->audioformat == 0) - bfd->user->audioformat = 0x24; - if(bfd->user->audiorate == 0) - bfd->user->audiorate = 44100; - bhead = blo_nextbhead(fd, bhead); /* read all attached data */ diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 8aaede7515a..c54e09b2b40 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1245,6 +1245,18 @@ void init_userdef_do_versions(void) SETCOLF(btheme->tuserpref.back, 0.45, 0.45, 0.45, 1.0); } } + + if (G.main->versionfile < 250 || (G.main->versionfile == 250 && G.main->subversionfile < 3)) { + /* new audio system */ + if(U.audiochannels == 0) + U.audiochannels = 2; + if(U.audiodevice == 0) + U.audiodevice = 2; + if(U.audioformat == 0) + U.audioformat = 0x24; + if(U.audiorate == 0) + U.audiorate = 44100; + } /* GL Texture Garbage Collection (variable abused above!) */ if (U.textimeout == 0) { |