diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.h')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index ed22daef9ec..f5c19f5ee22 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -75,7 +75,7 @@ typedef struct FileData { // general reading variables struct SDNA *filesdna; struct SDNA *memsdna; - char *compflags; + char *compflags; /* array of eSDNA_StructCompare */ int fileversion; int id_name_offs; /* used to retrieve ID names from (bhead+1) */ @@ -96,7 +96,8 @@ typedef struct FileData { struct GHash *bhead_idname_hash; ListBase *mainlist; - + ListBase *old_mainlist; /* Used for undo. */ + /* ick ick, used to return * data through streamglue. */ @@ -109,13 +110,15 @@ typedef struct BHeadN { struct BHead bhead; } BHeadN; - -#define FD_FLAGS_SWITCH_ENDIAN (1 << 0) -#define FD_FLAGS_FILE_POINTSIZE_IS_4 (1 << 1) -#define FD_FLAGS_POINTSIZE_DIFFERS (1 << 2) -#define FD_FLAGS_FILE_OK (1 << 3) -#define FD_FLAGS_NOT_MY_BUFFER (1 << 4) -#define FD_FLAGS_NOT_MY_LIBMAP (1 << 5) +/* FileData->flags */ +enum { + FD_FLAGS_SWITCH_ENDIAN = 1 << 0, + FD_FLAGS_FILE_POINTSIZE_IS_4 = 1 << 1, + FD_FLAGS_POINTSIZE_DIFFERS = 1 << 2, + FD_FLAGS_FILE_OK = 1 << 3, + FD_FLAGS_NOT_MY_BUFFER = 1 << 4, + FD_FLAGS_NOT_MY_LIBMAP = 1 << 5, /* XXX Unused in practice (checked once but never set). */ +}; #define SIZEOFBLENDERHEADER 12 @@ -139,7 +142,7 @@ void blo_make_sound_pointer_map(FileData *fd, Main *oldmain); void blo_end_sound_pointer_map(FileData *fd, Main *oldmain); void blo_make_packed_pointer_map(FileData *fd, Main *oldmain); void blo_end_packed_pointer_map(FileData *fd, Main *oldmain); -void blo_add_library_pointer_map(ListBase *mainlist, FileData *fd); +void blo_add_library_pointer_map(ListBase *old_mainlist, FileData *fd); void blo_freefiledata(FileData *fd); |