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

[Jeroen Bakker]

Commit: 9980b2bea57a910088f5b3abcd14f159d751b705
Author: Jeroen Bakker
Date:   Fri Jul 8 14:08:07 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rB9980b2bea57a910088f5b3abcd14f159d751b705

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

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index a26f8ee3b36,14204479849..d7721a71427
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -3201,12 -3256,33 +3256,40 @@@ 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. */
+ 
+     /* Initialize brush curves sculpt settings. */
+     LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+       if (brush->ob_mode != OB_MODE_SCULPT_CURVES) {
+         continue;
+       }
+       brush->curves_sculpt_settings->density_add_attempts = 100;
+     }
+ 
+     /* Disable 'show_bounds' option of curve objects. Option was set as there was no object mode
+      * outline implementation. See T95933. */
+     LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+       if (ob->type == OB_CURVES) {
+         ob->dtx &= ~OB_DRAWBOUNDOX;
+       }
+     }
+   }
  }