diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-16 17:42:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-16 17:42:49 +0300 |
| commit | fc61cdf1428dc74f4ef9b834de9082f910ce08e0 (patch) | |
| tree | ba4f4dc67a11c83c3dea90803e578053f0aa734b /source/gameengine | |
| parent | dd3ae7bad70ecfd466791f371b138b5b958e0a19 (diff) | |
| parent | 0434053f1329384c312fd07812bce48ec9c28f50 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index dd93a6ff424..0c206dfce3d 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); + bfd= BLO_read_from_file(progname, &reports, BLO_READ_SKIP_NONE); } if (!bfd && filename) { |