[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39979] trunk/blender/source/blender/ blenkernel/intern/blender.c: Fix missing warning message when reading files that are not forward compatible ,

Brecht Van Lommel brechtvanlommel at pandora.be
Tue Sep 6 19:27:18 CEST 2011


Revision: 39979
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39979
Author:   blendix
Date:     2011-09-06 17:27:18 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
Fix missing warning message when reading files that are not forward compatible,
it seems this never worked in 2.5.

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	2011-09-06 17:18:50 UTC (rev 39978)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2011-09-06 17:27:18 UTC (rev 39979)
@@ -324,17 +324,14 @@
 	MEM_freeN(bfd);
 }
 
-static int handle_subversion_warning(Main *main)
+static int handle_subversion_warning(Main *main, ReportList *reports)
 {
 	if(main->minversionfile > BLENDER_VERSION ||
 	   (main->minversionfile == BLENDER_VERSION && 
 		 main->minsubversionfile > BLENDER_SUBVERSION)) {
-		
-		char str[128];
-		
-		BLI_snprintf(str, sizeof(str), "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile);
-// XXX		error(str);
+		BKE_reportf(reports, RPT_ERROR, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile);
 	}
+
 	return 1;
 }
 
@@ -392,7 +389,7 @@
 	if (bfd) {
 		if(bfd->user) retval= BKE_READ_FILE_OK_USERPREFS;
 		
-		if(0==handle_subversion_warning(bfd->main)) {
+		if(0==handle_subversion_warning(bfd->main, reports)) {
 			free_main(bfd->main);
 			MEM_freeN(bfd);
 			bfd= NULL;




More information about the Bf-blender-cvs mailing list