[Bf-blender-cvs] [38df935c098] master: Fix T84646: Compositor: In Blender 292 "Set Alpha" node is undefined

[Jeroen Bakker]

Commit: 38df935c0985ea10dd79b92f6cb5f468931f04c1
Author: Jeroen Bakker
Date:   Wed Jan 13 12:07:26 2021 +0100
Branches: master
https://developer.blender.org/rB38df935c0985ea10dd79b92f6cb5f468931f04c1

Fix T84646: Compositor: In Blender 292 "Set Alpha" node is undefined

Incorrect version code introduced by 9dbea1db66da would not check inside
node groups.

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

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 f3f7ea608f5..da57f8805b6 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -1491,13 +1491,11 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
   if (!MAIN_VERSION_ATLEAST(bmain, 292, 10)) {
     if (!DNA_struct_find(fd->filesdna, "NodeSetAlpha")) {
-      LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
-        bNodeTree *nodetree = scene->nodetree;
-        if (nodetree == NULL) {
+      LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
+        if (ntree->type != NTREE_COMPOSIT) {
           continue;
         }
-
-        LISTBASE_FOREACH (bNode *, node, &nodetree->nodes) {
+        LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
           if (node->type != CMP_NODE_SETALPHA) {
             continue;
           }