[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19987] trunk/blender/source/blender/ blenkernel/intern/blender.c: * instead of using okee() (breaking builds) use error() in 250 subversion handling in 2.49

[Nathan Letwory]

Revision: 19987
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19987
Author:   jesterking
Date:     2009-04-30 00:09:28 +0200 (Thu, 30 Apr 2009)

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

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/blender.c

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c    2009-04-29 
20:56:27 UTC (rev 19986)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c    2009-04-29 
22:09:28 UTC (rev 19987)
@@ -429,7 +429,6 @@
           (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 @@
                        
                        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 @@
                        free_main(bfd->main);
                        MEM_freeN(bfd);
                        bfd= NULL;
+                       retval= 0;
                }
                else
                        setup_app_data(bfd, dir); // frees BFD


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs