diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2019-07-22 20:24:04 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2019-07-22 20:24:04 +0300 |
| commit | 6ac50f4bea42ac3530b64153c2101b41269aa716 (patch) | |
| tree | 37b4942a26d52573467b64dd94fef642f84d6191 /source/blender/blenloader/intern/versioning_280.c | |
| parent | b6405d001ae3426b053d621bbc5db2f315d38a1e (diff) | |
| parent | 8c618371507fc95d51671d2f807e864adf1f4791 (diff) | |
Merge branch 'master' into soc-2019-outliner
Diffstat (limited to 'source/blender/blenloader/intern/versioning_280.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 4b5ae0ef866..b65db5f6184 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -3495,9 +3495,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - { - /* Versioning code until next subversion bump goes here. */ - + if (!MAIN_VERSION_ATLEAST(bmain, 280, 75)) { for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { if (scene->master_collection != NULL) { scene->master_collection->flag &= ~(COLLECTION_RESTRICT_VIEWPORT | @@ -3546,4 +3544,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + { + /* Versioning code until next subversion bump goes here. */ + } } |