[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35556] trunk/blender/source/blender/ blenkernel/intern/blender.c: use defines for BKE_read_file, no functional change.

Campbell Barton ideasman42 at gmail.com
Tue Mar 15 06:00:10 CET 2011


Revision: 35556
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35556
Author:   campbellbarton
Date:     2011-03-15 05:00:10 +0000 (Tue, 15 Mar 2011)
Log Message:
-----------
use defines for BKE_read_file, no functional change.

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-03-15 03:38:15 UTC (rev 35555)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2011-03-15 05:00:10 UTC (rev 35556)
@@ -353,20 +353,20 @@
 int BKE_read_file(bContext *C, const char *dir, ReportList *reports) 
 {
 	BlendFileData *bfd;
-	int retval= 1;
+	int retval= BKE_READ_FILE_OK;
 
 	if(strstr(dir, BLENDER_STARTUP_FILE)==NULL) /* dont print user-pref loading */
 		printf("read blend: %s\n", dir);
 
 	bfd= BLO_read_from_file(dir, reports);
 	if (bfd) {
-		if(bfd->user) retval= 2;
+		if(bfd->user) retval= BKE_READ_FILE_OK_USERPREFS;
 		
 		if(0==handle_subversion_warning(bfd->main)) {
 			free_main(bfd->main);
 			MEM_freeN(bfd);
 			bfd= NULL;
-			retval= 0;
+			retval= BKE_READ_FILE_FAIL;
 		}
 		else
 			setup_app_data(C, bfd, dir); // frees BFD
@@ -374,7 +374,7 @@
 	else
 		BKE_reports_prependf(reports, "Loading %s failed: ", dir);
 		
-	return (bfd?retval:0);
+	return (bfd?retval:BKE_READ_FILE_FAIL);
 }
 
 int BKE_read_file_from_memory(bContext *C, char* filebuf, int filelength, ReportList *reports)




More information about the Bf-blender-cvs mailing list