Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2021-01-13 14:07:26 +0300
committerJeroen Bakker <jeroen@blender.org>2021-01-13 14:07:26 +0300
commit38df935c0985ea10dd79b92f6cb5f468931f04c1 (patch)
tree6a807f627cc878062f2a99f0e8105ff307852c45 /source/blender/blenloader
parentaed5b88ec1a651faad5f4a95828e1b9d907f0af4 (diff)
Fix T84646: Compositor: In Blender 292 "Set Alpha" node is undefined
Incorrect version code introduced by 9dbea1db66da would not check inside node groups.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_290.c8
1 files changed, 3 insertions, 5 deletions
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;
}