[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54409] trunk/blender/source/blender/ windowmanager/intern/wm_files.c: omit warning about startup. blend being missing when loading with '--factory-startup'

[Campbell Barton]

Revision: 54409
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54409
Author:   campbellbarton
Date:     2013-02-09 13:58:37 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
omit warning about startup.blend being missing when loading with '--factory-startup'

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2013-02-09 12:30:42 UTC (rev 54408)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2013-02-09 13:58:37 UTC (rev 54409)
@@ -520,15 +520,16 @@
 	/* put aside screens to match with persistent windows later */
 	wm_window_match_init(C, &wmbase); 
 	
-	if (!from_memory && BLI_exists(startstr)) {
-		success = (BKE_read_file(C, startstr, NULL) != BKE_READ_FILE_FAIL);
-		
+	if (!from_memory) {
+		if (BLI_exists(startstr)) {
+			success = (BKE_read_file(C, startstr, NULL) != BKE_READ_FILE_FAIL);
+		}
+
+		if (U.themes.first == NULL) {
+			printf("\nNote: No (valid) '%s' found, fall back to built-in default.\n\n", startstr);
+			success = 0;
+		}
 	}
-	
-	if (U.themes.first == NULL) {
-		printf("\nNote: No (valid) "STRINGIFY (BLENDER_STARTUP_FILE)" found, fall back to built-in default.\n\n");
-		success = 0;
-	}
 
 	if (success == 0) {
 		success = BKE_read_file_from_memory(C, datatoc_startup_blend, datatoc_startup_blend_size, NULL);