diff options
author | Michael Kowalski <makowalski@nvidia.com> | 2022-09-23 23:56:14 +0300 |
---|---|---|
committer | Michael Kowalski <makowalski@nvidia.com> | 2022-09-23 23:56:14 +0300 |
commit | b2ad97ba97f3e55d1dd463e29ca0b2ec6fe761e1 (patch) | |
tree | f94394835c6b731e4e379f4ef48fb78b4af4b9ca /source/blender/blenloader/intern/readfile.h | |
parent | b31807c75f0c18c43ac6979e6da57dc9d420167a (diff) | |
parent | 7e980f2b8cb96aa6d04dc72899d08473367eeeb9 (diff) |
Merge branch 'master' into tmp-usd-alab-v2-T100452tmp-usd-alab-v2-T100452
Diffstat (limited to 'source/blender/blenloader/intern/readfile.h')
-rw-r--r-- | source/blender/blenloader/intern/readfile.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 4522adb2aef..2171d513d69 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -17,6 +17,10 @@ #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" /* for eReportType */ +#ifdef __cplusplus +extern "C" { +#endif + struct BLI_mmap_file; struct BLOCacheStorage; struct IDNameLib_Map; @@ -38,6 +42,7 @@ enum eFileDataFlag { /* XXX Unused in practice (checked once but never set). */ FD_FLAGS_NOT_MY_LIBMAP = 1 << 5, }; +ENUM_OPERATORS(eFileDataFlag, FD_FLAGS_NOT_MY_LIBMAP) /* Disallow since it's 32bit on ms-windows. */ #ifdef __GNUC__ @@ -207,6 +212,7 @@ void blo_do_versions_270(struct FileData *fd, struct Library *lib, struct Main * void blo_do_versions_280(struct FileData *fd, struct Library *lib, struct Main *bmain); void blo_do_versions_290(struct FileData *fd, struct Library *lib, struct Main *bmain); void blo_do_versions_300(struct FileData *fd, struct Library *lib, struct Main *bmain); +void blo_do_versions_400(struct FileData *fd, struct Library *lib, struct Main *bmain); void blo_do_versions_cycles(struct FileData *fd, struct Library *lib, struct Main *bmain); void do_versions_after_linking_250(struct Main *bmain); @@ -224,3 +230,7 @@ void do_versions_after_linking_cycles(struct Main *bmain); * but better use that nasty hack in do_version than readfile itself. */ void *blo_read_get_new_globaldata_address(struct FileData *fd, const void *adr); + +#ifdef __cplusplus +} +#endif |