Merge branch 'blender-v2.83-release'

1 files changed, 21 insertions, 9 deletions

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index a8203e7b083..b6d53aee618 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -5183,6 +5183,27 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
     }
   }
 
+  if (!MAIN_VERSION_ATLEAST(bmain, 283, 17)) {
+    /* Reset the cloth mass to 1.0 in brushes with an invalid value. */
+    for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
+      if (br->sculpt_tool == SCULPT_TOOL_CLOTH) {
+        if (br->cloth_mass == 0.0f) {
+          br->cloth_mass = 1.0f;
+        }
+      }
+    }
+  }
+
+  /** Repair files from duplicate brushes added to blend files, see: T76738. */
+  if (!MAIN_VERSION_ATLEAST(bmain, 283, 17) ||
+      ((bmain->versionfile == 290) && !MAIN_VERSION_ATLEAST(bmain, 290, 2))) {
+    short id_codes[] = {ID_BR, ID_PAL};
+    for (int i = 0; i < ARRAY_SIZE(id_codes); i++) {
+      ListBase *lb = which_libbase(bmain, id_codes[i]);
+      BKE_main_id_repair_duplicate_names_listbase(lb);
+    }
+  }
+
   /**
    * Versioning code until next subversion bump goes here.
    *
@@ -5195,14 +5216,5 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
    */
   {
     /* Keep this block, even when empty. */
-
-    /* Reset the cloth mass to 1.0 in brushes with an invalid value. */
-    for (Brush *br = bmain->brushes.first; br; br = br->id.next) {
-      if (br->sculpt_tool == SCULPT_TOOL_CLOTH) {
-        if (br->cloth_mass == 0.0f) {
-          br->cloth_mass = 1.0f;
-        }
-      }
-    }
   }
 }