griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* instead of using okee() (breaking builds) use error() in 250 subversion handling in 2.49

Browse Source
This commit is contained in:
Nathan Letwory
2009-04-29 22:09:28 +00:00
parent 4d7017b423
commit ebf631b3fe
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/blender.c
View File

@@ -429,7 +429,6 @@ static int handle_subversion_warning(Main *main)
(main->minversionfile == BLENDER_VERSION &&
main->minsubversionfile > BLENDER_SUBVERSION)) {
extern int okee(char *str, ...); // XXX BAD LEVEL, DO NOT PORT TO 2.5!
char str[128];
if(main->minversionfile >= 250) {
@@ -437,10 +436,9 @@ static int handle_subversion_warning(Main *main)
if(G.background) {
printf("ERROR: cannot render %d file\n", main->versionfile);
return 0;
}
else
return okee(str);
error(str);
return 0;
}
else {
sprintf(str, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile);
@@ -475,6 +473,7 @@ int BKE_read_file(char *dir, void *type_r)
free_main(bfd->main);
MEM_freeN(bfd);
bfd= NULL;
retval= 0;
}
else
setup_app_data(bfd, dir); // frees BFD