[Bf-blender-cvs] [b8dc845e573] master: Merge branch 'blender-v3.0-release'

[Richard Antalik]

Commit: b8dc845e5733a281e86e9ecc0fac5580699a14e1
Author: Richard Antalik
Date:   Fri Nov 19 06:22:47 2021 +0100
Branches: master
https://developer.blender.org/rBb8dc845e5733a281e86e9ecc0fac5580699a14e1

Merge branch 'blender-v3.0-release'

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index b8004f60c59,f8a46f205d4..8156c83233a
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -1272,18 -1273,15 +1273,27 @@@ static void version_geometry_nodes_set_
    }
  }
  
 +static void version_node_tree_socket_id_delim(bNodeTree *ntree)
 +{
 +  LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
 +    LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
 +      version_node_socket_id_delim(socket);
 +    }
 +    LISTBASE_FOREACH (bNodeSocket *, socket, &node->outputs) {
 +      version_node_socket_id_delim(socket);
 +    }
 +  }
 +}
 +
+ static bool version_fix_seq_meta_range(Sequence *seq, void *user_data)
+ {
+   Scene *scene = (Scene *)user_data;
+   if (seq->type == SEQ_TYPE_META) {
+     SEQ_time_update_meta_strip_range(scene, seq);
+   }
+   return true;
+ }
+ 
  /* NOLINTNEXTLINE: readability-function-size */
  void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
  {
@@@ -2195,23 -2204,13 +2205,32 @@@
        }
      }
  
 +    /* Change minimum zoom to 0.05f in the node editor. */
 +    LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
 +      LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
 +        LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
 +          if (sl->spacetype == SPACE_NODE) {
 +            ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
 +                                                                   &sl->regionbase;
 +            LISTBASE_FOREACH (ARegion *, region, regionbase) {
 +              if (region->regiontype == RGN_TYPE_WINDOW) {
 +                if (region->v2d.minzoom > 0.05f) {
 +                  region->v2d.minzoom = 0.05f;
 +                }
 +              }
 +            }
 +          }
 +        }
 +      }
 +    }
++
+     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+       Editing *ed = SEQ_editing_get(scene);
+       /* Make sure range of meta strips is correct.
+        * It was possible to save .blend file with incorrect state of meta strip
+        * range. The root cause is expected to be fixed, but need to ensure files
+        * with invalid meta strip range are corrected. */
+       SEQ_for_each_callback(&ed->seqbase, version_fix_seq_meta_range, scene);
+     }
    }
  }