diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-18 10:20:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-18 10:20:28 +0300 |
commit | a02feaeba909a9e3295631ca11ab43dfa7682b4f (patch) | |
tree | 8ac259e7f8ae10144655b77f678ab73b582dd49f | |
parent | 7d055da327b9555f76035075ce4e228d31f04df4 (diff) |
Cleanup: merge checks for same version
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 0b2e44bff86..b3cd1a6a1b7 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -900,17 +900,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) } } } - } - if (!MAIN_VERSION_ATLEAST(main, 280, 6)) { if (!DNA_struct_elem_find(fd->filesdna, "LightProbe", "float", "intensity")) { for (LightProbe *probe = main->lightprobe.first; probe; probe = probe->id.next) { probe->intensity = 1.0f; } } - } - if (!MAIN_VERSION_ATLEAST(main, 280, 6)) { for (Object *ob = main->object.first; ob; ob = ob->id.next) { bConstraint *con, *con_next; con = ob->constraints.first; @@ -930,16 +926,10 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) scene->orientation_index_custom = -1; } } - } - - if (!MAIN_VERSION_ATLEAST(main, 280, 6)) { - bScreen *sc; - ScrArea *sa; - SpaceLink *sl; - for (sc = main->screen.first; sc; sc = sc->id.next) { - for (sa = sc->areabase.first; sa; sa = sa->next) { - for (sl = sa->spacedata.first; sl; sl = sl->next) { + for (bScreen *sc = main->screen.first; sc; sc = sc->id.next) { + for (ScrArea *sa = sc->areabase.first; sa; sa = sa->next) { + for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { View3D *v3d = (View3D *)sl; v3d->drawtype_solid = OB_LIGHTING_STUDIO; |