Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenloader / intern / versioning_270.c
index cb7c46d24f3ec8157a2802f2c2e5f4e1822628e0..cabb1409603aa1302ae9085560e8524b67cf2aa5 100644 (file)
@@ -1659,7 +1659,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
                } FOREACH_NODETREE_END
        }
 
-       {
+       if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
                for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
                        if (scene->r.im_format.exr_codec == R_IMF_EXR_CODEC_DWAB) {
                                scene->r.im_format.exr_codec = R_IMF_EXR_CODEC_DWAA;
@@ -1697,7 +1697,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 void do_versions_after_linking_270(Main *main)
 {
        /* To be added to next subversion bump! */
-       {
+       if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
                FOREACH_NODETREE(main, ntree, id) {
                        if (ntree->type == NTREE_COMPOSIT) {
                                ntreeSetTypes(NULL, ntree);