[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12662] trunk/blender/source: Bugfix #7804 : Opened file is not registered correctly when started from command line

[Andrea Weikert]

Revision: 12662
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12662
Author:   elubie
Date:     2007-11-24 18:08:40 +0100 (Sat, 24 Nov 2007)

Log Message:
-----------
Bugfix #7804 : Opened file is not registered correctly when started from command line
- treat file passed as parameter the same as if loaded from UI if Blender isn't running in background mode.
- only set relative base as valid if file loaded successfully.

Modified Paths:
--------------
    trunk/blender/source/blender/src/usiblender.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/src/usiblender.c
===================================================================
--- trunk/blender/source/blender/src/usiblender.c	2007-11-23 14:48:26 UTC (rev 12661)
+++ trunk/blender/source/blender/src/usiblender.c	2007-11-24 17:08:40 UTC (rev 12662)
@@ -458,7 +458,7 @@
 
 		if(retval==2) init_userdef_file();	// in case a userdef is read from regular .blend
 		
-		G.relbase_valid = 1;
+		if (retval!=0) G.relbase_valid = 1;
 
 		undo_editmode_clear();
 		BKE_reset_undo();

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2007-11-23 14:48:26 UTC (rev 12661)
+++ trunk/blender/source/creator/creator.c	2007-11-24 17:08:40 UTC (rev 12662)
@@ -686,13 +686,19 @@
 				break;
 			}
 		}
-		else {
-			BKE_read_file(argv[a], NULL);
-			sound_initialize_sounds();
-			
-			/* happens for the UI on file reading too */
-			BKE_reset_undo();
-			BKE_write_undo("original");	/* save current state */
+		else {			
+			if (G.background) {
+				BKE_read_file(argv[a], NULL);
+				sound_initialize_sounds();
+
+				/* happens for the UI on file reading too */
+				BKE_reset_undo();
+				BKE_write_undo("original");	/* save current state */
+			} else {
+				/* we are not running in background mode here, but start blender in UI mode with 
+				   a file - this should do everything a 'load file' does */
+				BIF_read_file(argv[a]);
+			}			
 		}
 	}