diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-05 18:02:50 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-05 18:02:50 +0300 |
commit | f0d9dbae0dae4deae84824833096c38e625073cb (patch) | |
tree | a9fa826eb5860e9b62d16c3498703bde1bb5d4aa /source/blender/blenloader/intern/readfile.h | |
parent | ce6db959c7d96792edad3a6d606e3662a4ef0798 (diff) | |
parent | 481cdb08ed6f33a09d0e6843d1024db93c301178 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/blendfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_260.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/editors/render/render_shading.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/voxeldata.c
Diffstat (limited to 'source/blender/blenloader/intern/readfile.h')
-rw-r--r-- | source/blender/blenloader/intern/readfile.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 299c66f2bbb..7618c023882 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -169,14 +169,14 @@ void blo_do_version_old_trackto_to_constraints(struct Object *ob); void blo_do_versions_view3d_split_250(struct View3D *v3d, struct ListBase *regions); void blo_do_versions_key_uidgen(struct Key *key); -void blo_do_versions_pre250(struct FileData *fd, struct Library *lib, struct Main *main); -void blo_do_versions_250(struct FileData *fd, struct Library *lib, struct Main *main); -void blo_do_versions_260(struct FileData *fd, struct Library *lib, struct Main *main); -void blo_do_versions_270(struct FileData *fd, struct Library *lib, struct Main *main); -void blo_do_versions_280(struct FileData *fd, struct Library *lib, struct Main *main); - -void do_versions_after_linking_270(struct Main *main); -void do_versions_after_linking_280(struct Main *main); +void blo_do_versions_pre250(struct FileData *fd, struct Library *lib, struct Main *bmain); +void blo_do_versions_250(struct FileData *fd, struct Library *lib, struct Main *bmain); +void blo_do_versions_260(struct FileData *fd, struct Library *lib, struct Main *bmain); +void blo_do_versions_270(struct FileData *fd, struct Library *lib, struct Main *bmain); +void blo_do_versions_280(struct FileData *fd, struct Library *lib, struct Main *bmain); + +void do_versions_after_linking_270(struct Main *bmain); +void do_versions_after_linking_280(struct Main *bmain); #endif |