diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-20 21:25:23 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-24 13:44:27 +0300 |
commit | cc5a75d5727ab45c2521bf6103a28aa2503fbafc (patch) | |
tree | e230b1bc6706e7d79bcf1851ca46224f12b88fcd /source/blender/blenloader/intern/readfile.c | |
parent | d730e512ac56bd68c75f8c44ff186b51010db4c7 (diff) |
Cycles: move shader node versioning code to C
Shader nodes are now shared with Eevee, so makes more sense to have it in
the core and not be Cycles specific.
Fix T62415: issues with append/link of old Cycles settings.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index f8f43f1fa86..6646a46be56 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9420,6 +9420,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) blo_do_versions_260(fd, lib, main); blo_do_versions_270(fd, lib, main); blo_do_versions_280(fd, lib, main); + blo_do_versions_cycles(fd, lib, main); /* WATCH IT!!!: pointers from libdata have not been converted yet here! */ /* WATCH IT 2!: Userdef struct init see do_versions_userdef() above! */ @@ -9436,6 +9437,7 @@ static void do_versions_after_linking(Main *main) do_versions_after_linking_260(main); do_versions_after_linking_270(main); do_versions_after_linking_280(main); + do_versions_after_linking_cycles(main); } /** \} */ |