[Bf-blender-cvs] [fd025e3c0dc] temp-T97352-3d-texturing-seam-bleeding-b2: Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding-b2

[Jeroen Bakker]

Commit: fd025e3c0dc81fbe9b5470725c19a86cba7d4b9e
Author: Jeroen Bakker
Date:   Wed Aug 3 09:13:29 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rBfd025e3c0dc81fbe9b5470725c19a86cba7d4b9e

Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding-b2

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index d7721a71427,49b14dc84a6..b028bb323df
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -3256,26 -3285,9 +3285,16 @@@ void blo_do_versions_300(FileData *fd, 
          }
        }
      }
 +
 +    /* UVSeam fixing distance. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "Image", "short", "seamfix_iter")) {
 +      LISTBASE_FOREACH (Image *, image, &bmain->images) {
 +        image->seamfix_iter = 2;
 +      }
 +    }
    }
-   /**
-    * 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, 303, 6)) {
      /* Initialize brush curves sculpt settings. */
      LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
        if (brush->ob_mode != OB_MODE_SCULPT_CURVES) {