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.

1 files changed, 13 insertions, 7 deletions

diff --git a/source/creator/creator.c b/source/creator/creator.c
index 8588dc9db9c..1feaf075e1c 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -686,13 +686,19 @@ int main(int argc, char **argv)
 				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]);
+			}			
 		}
 	}