diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
commit | 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 (patch) | |
tree | b35fd8ad683c79a5cbd9f8419220ee1892cd9ef8 /source/blender/blenloader | |
parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
parent | b3727668168075137f2ded11d7a7821548e4451d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/BLO_runtime.h | 1 | ||||
-rw-r--r-- | source/blender/blenloader/BLO_undofile.h | 1 | ||||
-rw-r--r-- | source/blender/blenloader/BLO_writefile.h | 1 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 1 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.h | 1 | ||||
-rw-r--r-- | source/blender/blenloader/intern/runtime.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/blenloader/BLO_runtime.h b/source/blender/blenloader/BLO_runtime.h index 2c3947c9dda..09f25bdca53 100644 --- a/source/blender/blenloader/BLO_runtime.h +++ b/source/blender/blenloader/BLO_runtime.h @@ -51,4 +51,3 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports) #endif #endif /* __BLO_RUNTIME_H__ */ - diff --git a/source/blender/blenloader/BLO_undofile.h b/source/blender/blenloader/BLO_undofile.h index c407ea31b9b..59df361c7c1 100644 --- a/source/blender/blenloader/BLO_undofile.h +++ b/source/blender/blenloader/BLO_undofile.h @@ -69,4 +69,3 @@ extern struct Main *BLO_memfile_main_get(struct MemFile *memfile, struct Main *b extern bool BLO_memfile_write_file(struct MemFile *memfile, const char *filename); #endif /* __BLO_UNDOFILE_H__ */ - diff --git a/source/blender/blenloader/BLO_writefile.h b/source/blender/blenloader/BLO_writefile.h index af3bc2dbdcd..f6d0be6f5f0 100644 --- a/source/blender/blenloader/BLO_writefile.h +++ b/source/blender/blenloader/BLO_writefile.h @@ -45,4 +45,3 @@ extern bool BLO_write_file_mem( struct Main *mainvar, struct MemFile *compare, struct MemFile *current, int write_flags); #endif - diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 4ccdbd9e8e1..7488d62bb3c 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -474,4 +474,3 @@ void BLO_blendfiledata_free(BlendFileData *bfd) MEM_freeN(bfd); } - diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 65938c88192..9c699db5583 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -179,4 +179,3 @@ void do_versions_after_linking_270(struct Main *bmain); void do_versions_after_linking_280(struct Main *bmain); #endif - diff --git a/source/blender/blenloader/intern/runtime.c b/source/blender/blenloader/intern/runtime.c index ec0e8ba4738..985e8169819 100644 --- a/source/blender/blenloader/intern/runtime.c +++ b/source/blender/blenloader/intern/runtime.c @@ -139,4 +139,3 @@ cleanup: return bfd; } - |