[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20001] trunk/blender/source/blender/ blenkernel: Second trial to get an OK menu work to allow people to decide whether

[Ton Roosendaal]

Revision: 20001
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20001
Author:   ton
Date:     2009-04-30 12:11:37 +0200 (Thu, 30 Apr 2009)

Log Message:
-----------
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?

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
    trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    trunk/blender/source/blender/blenkernel/intern/blender.c

Modified: trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h	2009-04-30 08:02:26 UTC (rev 20000)
+++ trunk/blender/source/blender/blenkernel/BKE_bad_level_calls.h	2009-04-30 10:11:37 UTC (rev 20001)
@@ -92,6 +92,7 @@
 struct Oops;
 void free_oops(struct Oops *oops);
 void error(char *str, ...);
+int okee(char *str, ...);
 
 /* anim.c */
 extern struct ListBase editNurb;

Modified: trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c	2009-04-30 08:02:26 UTC (rev 20000)
+++ trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c	2009-04-30 10:11:37 UTC (rev 20001)
@@ -160,6 +160,7 @@
 void free_oops(struct Oops *oops){}
 void exit_posemode(int freedata){}
 void error(char *str, ...){}
+int okee(char *str, ...){}
 
 /* anim.c */
 ListBase editNurb;

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c	2009-04-30 08:02:26 UTC (rev 20000)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2009-04-30 10:11:37 UTC (rev 20001)
@@ -431,14 +431,14 @@
 		
 		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);