[Bf-blender-cvs] [41dfeb8e6dd] compositor-cryptomatte-workflow: Fixed bad merge

[Jeroen Bakker]

Commit: 41dfeb8e6ddd09fb284462f91d91a0ca1ad0aaae
Author: Jeroen Bakker
Date:   Mon Feb 15 10:08:49 2021 +0100
Branches: compositor-cryptomatte-workflow
https://developer.blender.org/rB41dfeb8e6ddd09fb284462f91d91a0ca1ad0aaae

Fixed bad merge

===================================================================

M	source/blender/blenloader/intern/versioning_290.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 28986d4704c..15fbdb73668 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -611,19 +611,6 @@ void do_versions_after_linking_290(Main *bmain, ReportList *UNUSED(reports))
    */
   {
     /* Keep this block, even when empty. */
-
-    /* Convert `NodeCryptomatte->storage->matte_id` to `NodeCryptomatte->storage->entries` */
-    if (!DNA_struct_find(fd->filesdna, "CryptomatteEntry")) {
-      LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
-        if (scene->nodetree) {
-          LISTBASE_FOREACH (bNode *, node, &scene->nodetree->nodes) {
-            if (node->type == CMP_NODE_CRYPTOMATTE) {
-              compositor_convert_cryptomatte_node(bmain, node);
-            }
-          }
-        }
-      }
-    }
   }
 }
 
@@ -1766,6 +1753,19 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
       }
     }
 
+    /* Convert `NodeCryptomatte->storage->matte_id` to `NodeCryptomatte->storage->entries` */
+    if (!DNA_struct_find(fd->filesdna, "CryptomatteEntry")) {
+      LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+        if (scene->nodetree) {
+          LISTBASE_FOREACH (bNode *, node, &scene->nodetree->nodes) {
+            if (node->type == CMP_NODE_CRYPTOMATTE) {
+              compositor_convert_cryptomatte_node(bmain, node);
+            }
+          }
+        }
+      }
+    }
+
     /* Keep this block, even when empty. */
   }
 }