archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.5: increase subversion to init new sound userpref variables.

Browse Source
This commit is contained in:
Brecht Van Lommel
2009-09-04 21:34:17 +00:00
parent a49020b241
commit d3e35f0968
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender.h
View File

@@ -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

10
source/blender/blenloader/intern/readfile.c
View File

@@ -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 */

12
source/blender/editors/interface/resources.c
View File

@@ -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) {