diff options
author | Ton Roosendaal <ton@blender.org> | 2009-04-30 14:11:37 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-04-30 14:11:37 +0400 |
commit | de2cc4d14d1b7a7b47cbbf01db7c980d929a7846 (patch) | |
tree | dc768491fc5816162cd71fa126b6b018355b887b /source/blender/blenkernel/intern | |
parent | 81ea467091996dab41a10af1111cd85fd34d1d69 (diff) |
Second trial to get an OK menu work to allow people to decide whether
or not to use a 2.5+ saved file in 2.49. Apparently the msvc linker
was choking on it?
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 73c93abdf4b..107953138c6 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -431,14 +431,14 @@ static int handle_subversion_warning(Main *main) char str[128]; + /* XXX DO NOT PORT OVER TO 2.5 BRANCH! */ if(main->minversionfile >= 250) { sprintf(str, "You have opened a %d file, key information will get lost, like animation data. Continue?", main->minversionfile); if(G.background) { printf("ERROR: cannot render %d file\n", main->versionfile); } - error(str); - return 0; + return okee(str); } else { sprintf(str, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile); |