diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-22 06:57:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-22 07:06:14 +0300 |
| commit | c66570f519fb24e0c3fb724d7b6d38f4b6fd7ffc (patch) | |
| tree | 78d0c03da4ada3bfb64e39b8f686a419f2c84395 /source/gameengine | |
| parent | 968bf0df148c6fac7567860a64433daa97d042c9 (diff) | |
Fix T57989: File loaded as startup
The file contents was used to check if the file was a startup file.
Now pass in an argument from startup loading code instead.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 3 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 22616458b54..84cbf4bf85b 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -110,7 +110,8 @@ static BlendFileData *load_game_data(const char *filename) BlendFileData *bfd; BKE_reports_init(&reports, RPT_STORE); - bfd= BLO_read_from_file(filename, &reports, BLO_READ_SKIP_USERDEF); + bfd= BLO_read_from_file(filename, BLO_READ_SKIP_USERDEF, &reports); + if (!bfd) { printf("Loading %s failed: ", filename); diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 42b603f8980..46b477a6da5 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -355,7 +355,7 @@ static BlendFileData *load_game_data(const char *progname, char *filename = NULL BLI_strncpy(bfd->main->name, progname, sizeof(bfd->main->name)); } } else { - bfd= BLO_read_from_file(progname, &reports, BLO_READ_SKIP_NONE); + bfd= BLO_read_from_file(progname, BLO_READ_SKIP_NONE, &reports); } if (!bfd && filename) { |