diff options
| author | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-08-07 14:04:31 +0300 |
| commit | 0d2d4a6d4a75ac38c41f872c88255eab70e88ab7 (patch) | |
| tree | b7a7518af86dddba48e05a98b3c2be55e8804721 /source/blender/blenloader/intern/readfile.h | |
| parent | 9b416c66fb714bdfd15a481489dbf650d0f389ea (diff) | |
| parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) | |
Merge branch 'master' into temp-ui-button-type-refactortemp-ui-button-type-refactor
Diffstat (limited to 'source/blender/blenloader/intern/readfile.h')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 57c86f7128c..34a670a8357 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -22,8 +22,7 @@ * \ingroup blenloader */ -#ifndef __READFILE_H__ -#define __READFILE_H__ +#pragma once #include "DNA_sdna_types.h" #include "DNA_space_types.h" @@ -116,11 +115,6 @@ typedef struct FileData { struct OldNewMap *datamap; struct OldNewMap *globmap; struct OldNewMap *libmap; - struct OldNewMap *imamap; - struct OldNewMap *movieclipmap; - struct OldNewMap *scenemap; - struct OldNewMap *soundmap; - struct OldNewMap *volumemap; struct OldNewMap *packedmap; struct BLOCacheStorage *cache_storage; @@ -154,16 +148,6 @@ FileData *blo_filedata_from_memfile(struct MemFile *memfile, struct ReportList *reports); void blo_clear_proxy_pointers_from_lib(struct Main *oldmain); -void blo_make_image_pointer_map(FileData *fd, struct Main *oldmain); -void blo_end_image_pointer_map(FileData *fd, struct Main *oldmain); -void blo_make_scene_pointer_map(FileData *fd, struct Main *oldmain); -void blo_end_scene_pointer_map(FileData *fd, struct Main *oldmain); -void blo_make_movieclip_pointer_map(FileData *fd, struct Main *oldmain); -void blo_end_movieclip_pointer_map(FileData *fd, struct Main *oldmain); -void blo_make_sound_pointer_map(FileData *fd, struct Main *oldmain); -void blo_end_sound_pointer_map(FileData *fd, struct Main *oldmain); -void blo_make_volume_pointer_map(FileData *fd, struct Main *oldmain); -void blo_end_volume_pointer_map(FileData *fd, struct Main *oldmain); void blo_make_packed_pointer_map(FileData *fd, struct Main *oldmain); void blo_end_packed_pointer_map(FileData *fd, struct Main *oldmain); void blo_add_library_pointer_map(ListBase *old_mainlist, FileData *fd); @@ -214,5 +198,3 @@ void do_versions_after_linking_270(struct Main *bmain); void do_versions_after_linking_280(struct Main *bmain, struct ReportList *reports); void do_versions_after_linking_290(struct Main *bmain, struct ReportList *reports); void do_versions_after_linking_cycles(struct Main *bmain); - -#endif |