diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
| commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
| tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/blenloader/BLO_readfile.h | |
| parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
| parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/BLO_readfile.h')
| -rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index 8b5c64f4ecd..327812f78d5 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -164,7 +164,7 @@ struct BlendThumbnail *BLO_thumbnail_from_file(const char *filepath); struct Main *BLO_main_from_memfile(struct MemFile *memfile, struct Main *bmain, struct Scene **r_scene); #ifdef __cplusplus -} +} #endif #endif /* __BLO_READFILE_H__ */ |