diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-16 12:30:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-16 12:30:02 +0300 |
| commit | d68a84d1d2e11d88185cc5d55a6fda6d1dd99969 (patch) | |
| tree | 148df27ad82ec588458848ffdc924a00b6c01928 /source/blender | |
| parent | 375ede0f3fdef936d5712968143e06c846c8d6d6 (diff) | |
Fix BGE building.
When you use typedef'ed enum, you need to define all supported values
explicitely in enum, else compiler goes grumpy...
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/blender_undo.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/render/render_preview.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c index 396c06f96d1..e3a5edb2049 100644 --- a/source/blender/blenkernel/intern/blender_undo.c +++ b/source/blender/blenkernel/intern/blender_undo.c @@ -389,7 +389,7 @@ bool BKE_undo_save_file(const char *filename) Main *BKE_undo_get_main(Scene **r_scene) { Main *mainp = NULL; - BlendFileData *bfd = BLO_read_from_memfile(G.main, G.main->name, &curundo->memfile, NULL, 0); + BlendFileData *bfd = BLO_read_from_memfile(G.main, G.main->name, &curundo->memfile, NULL, BLO_READ_SKIP_NONE); if (bfd) { mainp = bfd->main; diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 146c67576ef..354f392528f 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -430,7 +430,7 @@ int BKE_blendfile_read_userdef(const char *filepath, ReportList *reports) BlendFileData *bfd; int retval = BKE_BLENDFILE_READ_FAIL; - bfd = BLO_read_from_file(filepath, reports, 0); + bfd = BLO_read_from_file(filepath, reports, BLO_READ_SKIP_NONE); if (bfd) { if (bfd->user) { retval = BKE_BLENDFILE_READ_OK_USERPREFS; diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index e07d567ce61..52b8d15b987 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -74,6 +74,7 @@ typedef struct BlendFileData { /* skip reading some data-block types (may want to skip screen data too). */ typedef enum eBLOReadSkip { + BLO_READ_SKIP_NONE = 0, BLO_READ_SKIP_USERDEF = (1 << 0), } eBLOReadSkip; diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index b715d636e62..fa18b82507e 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -196,7 +196,7 @@ static Main *load_main_from_memory(const void *blend, int blend_size) BlendFileData *bfd; G.fileflags |= G_FILE_NO_UI; - bfd = BLO_read_from_memory(blend, blend_size, NULL, 0); + bfd = BLO_read_from_memory(blend, blend_size, NULL, BLO_READ_SKIP_NONE); if (bfd) { bmain = bfd->main; |