[Bf-blender-cvs] [d2940844329] sculpt-dev: Merge branch 'master' into sculpt-dev

[Joseph Eagar]

Commit: d2940844329538c72509db1608c38df97e8389d7
Author: Joseph Eagar
Date:   Sat Oct 23 23:15:36 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rBd2940844329538c72509db1608c38df97e8389d7

Merge branch 'master' into sculpt-dev

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



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

diff --cc release/scripts/addons
index 49d31b83def,e68c0118c13..996ff7f8693
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 49d31b83def0231e7cfd2262f79031499d24580d
 -Subproject commit e68c0118c13c3575e6096ad2dc7fb4434eadf38e
++Subproject commit 996ff7f869357823867e3b02542418852e85aabd
diff --cc source/blender/blenloader/intern/versioning_userdef.c
index 6c9431f70b6,170e6be715a..493ee8decba
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@@ -949,24 -916,13 +953,32 @@@ void blo_do_versions_userdef(UserDef *u
      userdef->flag &= ~USER_FLAG_UNUSED_5;
    }
  
 +  /* Fix keymaps for sculpt */
 +  if (!USER_VERSION_ATLEAST(300, 25)) {
 +    LISTBASE_FOREACH (wmKeyMap *, keymap, &userdef->user_keymaps) {
 +      LISTBASE_FOREACH (wmKeyMapDiffItem *, kmdi, &keymap->diff_items) {
 +        if (kmdi->add_item) {
 +          keymap_radial_control_sculpt_fix(kmdi->add_item);
 +        }
 +
 +        if (kmdi->remove_item) {
 +          keymap_radial_control_sculpt_fix(kmdi->remove_item);
 +        }
 +      }
 +
 +      LISTBASE_FOREACH (wmKeyMapItem *, kmi, &keymap->items) {
 +        keymap_radial_control_sculpt_fix(kmi);
 +      }
 +    }
 +  }
++
+   if (!USER_VERSION_ATLEAST(300, 38)) {
+     /* Patch to set Dupli Lattice/Camera/Speaker. */
+     userdef->dupflag |= USER_DUP_LATTICE;
+     userdef->dupflag |= USER_DUP_CAMERA;
+     userdef->dupflag |= USER_DUP_SPEAKER;
+   }
+ 
    /**
     * Versioning code until next subversion bump goes here.
     *
diff --cc source/tools
index 723b24841df,7c5acb95df9..2e8c8792488
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 723b24841df1ed8478949bca20c73878fab00dca
 -Subproject commit 7c5acb95df918503d11cfc43172ce13901019289
++Subproject commit 2e8c879248822c8e500ed49d79acc605e5aa75b9