diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-15 22:28:12 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-15 22:28:23 +0300 |
commit | 209d4d6993e3ce3ccc7677530b0b678a22e3607a (patch) | |
tree | 8e52b596566b47110225d1f2eb9eba1901ad7f6f /source/gameengine | |
parent | 7f596d39dff110479f01cffcec203c3a98999b64 (diff) | |
parent | 68496c0b38c3df1237596dc8600ad990140da6a7 (diff) |
Merge branch 'master' into blender2.8
Needed for compile fix.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index d7fe8d8ce59..6c3751ae34d 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -104,13 +104,13 @@ typedef void * wmUIHandlerRemoveFunc; # include AUD_DEVICE_H #endif -static BlendFileData *load_game_data(char *filename) +static BlendFileData *load_game_data(const char *filename) { ReportList reports; BlendFileData *bfd; BKE_reports_init(&reports, RPT_STORE); - bfd= BLO_read_from_file(filename, &reports); + bfd= BLO_read_from_file(filename, &reports, BLO_READ_SKIP_USERDEF); if (!bfd) { printf("Loading %s failed: ", filename); |