diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-11-06 07:29:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-11-06 07:42:03 +0300 |
commit | 2d803d3f6d803ab6098410c56048f1df1ba48ee0 (patch) | |
tree | bf424d7588067f9c3350bf6030cbda0f12d5d50d /source/blender/blenloader | |
parent | 4f140ec7cc08e52eddae36f31bd7278506140679 (diff) |
Cleanup: use STR_ELEM macro
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index c46fdfc5b6a..0b7830c922a 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2100,7 +2100,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (!MAIN_VERSION_ATLEAST(bmain, 280, 8)) { /* Blender Internal removal */ for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { - if (STREQ(scene->r.engine, "BLENDER_RENDER") || STREQ(scene->r.engine, "BLENDER_GAME")) { + if (STR_ELEM(scene->r.engine, "BLENDER_RENDER", "BLENDER_GAME")) { BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine)); } @@ -4079,8 +4079,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) if (STREQ(view_settings->view_transform, "Default")) { STRNCPY(view_settings->view_transform, "Standard"); } - else if (STREQ(view_settings->view_transform, "RRT") || - STREQ(view_settings->view_transform, "Film")) { + else if (STR_ELEM(view_settings->view_transform, "RRT", "Film")) { STRNCPY(view_settings->view_transform, "Filmic"); } else if (STREQ(view_settings->view_transform, "Log")) { |