diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-08-13 01:11:36 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-08-14 14:36:56 +0300 |
commit | 13d469e6f0c554399629febeb1fd8d680b873a90 (patch) | |
tree | 16d8812da3b9cc1295a4693e1ec3e6687e1ae36f /source/blender/blenloader/intern/readfile.c | |
parent | d5002f007e8d770dea15f0881cd9d0a4f3aaf824 (diff) |
Eevee: Remove Additive & Multiply Blend mode
This commit also provide a compatibility code that will convert old
materials using Additive or Multiply Blend mode to their node equivalent.
This conversion is only done on outputs that are enabled for eevee.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 65120fc4c10..bcee606ea7b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9487,7 +9487,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) /* don't forget to set version number in BKE_blender_version.h! */ } -static void do_versions_after_linking(Main *main) +static void do_versions_after_linking(Main *main, ReportList *reports) { // printf("%s for %s (%s), %d.%d\n", __func__, main->curlib ? main->curlib->name : main->name, // main->curlib ? "LIB" : "MAIN", main->versionfile, main->subversionfile); @@ -9495,7 +9495,7 @@ static void do_versions_after_linking(Main *main) do_versions_after_linking_250(main); do_versions_after_linking_260(main); do_versions_after_linking_270(main); - do_versions_after_linking_280(main); + do_versions_after_linking_280(main, reports); do_versions_after_linking_cycles(main); } @@ -9798,7 +9798,7 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath) blo_split_main(&mainlist, bfd->main); for (Main *mainvar = mainlist.first; mainvar; mainvar = mainvar->next) { BLI_assert(mainvar->versionfile != 0); - do_versions_after_linking(mainvar); + do_versions_after_linking(mainvar, fd->reports); } blo_join_main(&mainlist); @@ -11569,7 +11569,7 @@ static void library_link_end(Main *mainl, * or they will go again through do_versions - bad, very bad! */ split_main_newid(mainvar, main_newid); - do_versions_after_linking(main_newid); + do_versions_after_linking(main_newid, (*fd)->reports); add_main_to_main(mainvar, main_newid); } |