sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Second trial to get an OK menu work to allow people to decide whether

Browse Source 
or not to use a 2.5+ saved file in 2.49. Apparently the msvc linker
was choking on it?
This commit is contained in:
Ton Roosendaal 2009-04-30 10:11:37 +00:00
parent 81ea467091
commit de2cc4d14d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_bad_level_calls.h
View File

@ -92,6 +92,7 @@ int pytype_is_pynode(struct PyObject *pyob);
struct Oops; struct Oops;
void free_oops(struct Oops *oops); void free_oops(struct Oops *oops);
void error(char *str, ...); void error(char *str, ...);
int okee(char *str, ...);
/* anim.c */ /* anim.c */
extern struct ListBase editNurb; extern struct ListBase editNurb;

1
source/blender/blenkernel/bad_level_call_stubs/stubs.c
View File

@ -160,6 +160,7 @@ void BPY_pyconstraint_target(struct bPythonConstraint *con, struct bConstraintTa
void free_oops(struct Oops *oops){} void free_oops(struct Oops *oops){}
void exit_posemode(int freedata){} void exit_posemode(int freedata){}
void error(char *str, ...){} void error(char *str, ...){}
int okee(char *str, ...){}
/* anim.c */ /* anim.c */
ListBase editNurb; ListBase editNurb;

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

@ -431,14 +431,14 @@ static int handle_subversion_warning(Main *main)
char str[128]; char str[128];
/* XXX DO NOT PORT OVER TO 2.5 BRANCH! */
if(main->minversionfile >= 250) { if(main->minversionfile >= 250) {
sprintf(str, "You have opened a %d file, key information will get lost, like animation data. Continue?", main->minversionfile); sprintf(str, "You have opened a %d file, key information will get lost, like animation data. Continue?", main->minversionfile);
if(G.background) { if(G.background) {
printf("ERROR: cannot render %d file\n", main->versionfile); printf("ERROR: cannot render %d file\n", main->versionfile);
} }
error(str); return okee(str);
return 0;
} }
else { else {
sprintf(str, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile); sprintf(str, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile);