[Bf-blender-cvs] [6bedcb24077] temp-lineart-contained: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: 6bedcb24077fba8566b1c767b9827cbcffa97f02
Author: YimingWu
Date:   Sat Jul 10 13:29:31 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB6bedcb24077fba8566b1c767b9827cbcffa97f02

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 80a983f9983,5d3bde428c0..b451bcb1e22
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -494,24 -479,15 +495,20 @@@ void blo_do_versions_300(FileData *fd, 
                      sizeof(scene->master_collection->id.name) - 2);
        }
      }
 +    LISTBASE_FOREACH (Material *, mat, &bmain->materials) {
 +      if (!(mat->lineart.flags & LRT_MATERIAL_CUSTOM_OCCLUSION_EFFECTIVENESS)) {
 +        mat->lineart.mat_occlusion = 1;
 +      }
 +    }
    }
  
-   /**
-    * Versioning code until next subversion bump goes here.
-    *
-    * \note Be sure to check when bumping the version:
-    * - "versioning_userdef.c", #blo_do_versions_userdef
-    * - "versioning_userdef.c", #do_versions_theme
-    *
-    * \note Keep this message at the bottom of the function.
-    */
-   {
-     /* Keep this block, even when empty. */
+   if (!MAIN_VERSION_ATLEAST(bmain, 300, 9)) {
+     /* Fix a bug where reordering FCurves and bActionGroups could cause some corruption. Just
+      * reconstruct all the action groups & ensure that the FCurves of a group are continuously
+      * stored (i.e. not mixed with other groups) to be sure. See T89435. */
+     LISTBASE_FOREACH (bAction *, act, &bmain->actions) {
+       BKE_action_groups_reconstruct(act);
+     }
  
      FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
        if (ntree->type == NTREE_GEOMETRY) {