[Bf-blender-cvs] [1234a7ada07] master: Merge branch 'blender-v3.1-release'

[Alexander Gavrilov]

Commit: 1234a7ada07db1dcaa1001ce699df04a0282ee28
Author: Alexander Gavrilov
Date:   Mon Feb 21 18:14:41 2022 +0300
Branches: master
https://developer.blender.org/rB1234a7ada07db1dcaa1001ce699df04a0282ee28

Merge branch 'blender-v3.1-release'

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index f14029d6555,d478ffb732e..4f4127b1a8d
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -2544,14 -2549,20 +2544,28 @@@ void blo_do_versions_300(FileData *fd, 
      }
    }
  
+   if (!MAIN_VERSION_ATLEAST(bmain, 301, 7)) {
+     /* Duplicate value for two flags that mistakenly had the same numeric value. */
+     LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+       LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
+         if (md->type == eModifierType_WeightVGProximity) {
+           WeightVGProximityModifierData *wpmd = (WeightVGProximityModifierData *)md;
+           if (wpmd->proximity_flags & MOD_WVG_PROXIMITY_INVERT_VGROUP_MASK) {
+             wpmd->proximity_flags |= MOD_WVG_PROXIMITY_WEIGHTS_NORMALIZE;
+           }
+         }
+       }
+     }
+   }
+ 
 +  if (!MAIN_VERSION_ATLEAST(bmain, 302, 2)) {
 +    LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
 +      if (scene->ed != NULL) {
 +        SEQ_for_each_callback(&scene->ed->seqbase, seq_transform_filter_set, NULL);
 +      }
 +    }
 +  }
 +
    /**
     * Versioning code until next subversion bump goes here.
     *