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:
authorAlexander Gavrilov <angavrilov@gmail.com>2022-02-21 18:15:17 +0300
committerAlexander Gavrilov <angavrilov@gmail.com>2022-02-21 18:15:17 +0300
commit68a2dc58dee719dc37a0ba2b84c5488999c2a458 (patch)
tree10f93480ca39ed44686b274b1273aaabbf23a453 /source/blender/blenloader
parent1234a7ada07db1dcaa1001ce699df04a0282ee28 (diff)
Weight Proximity: do flag split versioning both in 3.1 and 3.2
The flags overlapped ever since normalize was added, so this requires versioning to copy the flag value. This needs to be done both in Blender 3.1 and 3.2. Differential Revision: https://developer.blender.org/D14165
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_300.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c
index 4f4127b1a8d..2a840ea585a 100644
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@ -2544,7 +2544,8 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
- if (!MAIN_VERSION_ATLEAST(bmain, 301, 7)) {
+ if (!MAIN_VERSION_ATLEAST(bmain, 301, 7) ||
+ (bmain->versionfile == 302 && !MAIN_VERSION_ATLEAST(bmain, 302, 4))) {
/* Duplicate value for two flags that mistakenly had the same numeric value. */
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {