[Bf-blender-cvs] [62af8ae57bd] temp-sculpt-roll-mapping: Merge branch 'master' into temp-sculpt-roll-mapping

[Joseph Eagar]

Commit: 62af8ae57bda2a3554f384eabc784f137d69b97b
Author: Joseph Eagar
Date:   Thu Jan 12 19:34:16 2023 -0800
Branches: temp-sculpt-roll-mapping
https://developer.blender.org/rB62af8ae57bda2a3554f384eabc784f137d69b97b

Merge branch 'master' into temp-sculpt-roll-mapping

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



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

diff --cc release/datafiles/locale
index 4a581c54af9,4f6dbb69893..7084c4ecd97
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 4a581c54af9b92cb670d750951b9382160f10f3e
 -Subproject commit 4f6dbb69893bd6bdf73467effe77ae46c8e4ee37
++Subproject commit 7084c4ecd97d93459d9d23fd90f81589b09be5df
diff --cc release/scripts/addons
index 0b0052bd53a,bf49eeaa14c..a9d4443c244
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0b0052bd53ad8249ed07dfb87705c338af698bde
 -Subproject commit bf49eeaa14c445d3c53068203fdf91bff568fe64
++Subproject commit a9d4443c244f89399ec4bcc427e05a07950528cc
diff --cc release/scripts/addons_contrib
index 96143b1a8b0,0f72f6c85c3..bdcfdd47ec3
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 96143b1a8b037ea3c81f065f557025db9fe1ace3
 -Subproject commit 0f72f6c85c3743a9072273acb6a8a34b1cf1064b
++Subproject commit bdcfdd47ec3451822b21d1cff2ea2db751093c9a
diff --cc source/blender/editors/sculpt_paint/sculpt.cc
index c9bde27572d,e1586e00788..5916b3d2745
--- a/source/blender/editors/sculpt_paint/sculpt.cc
+++ b/source/blender/editors/sculpt_paint/sculpt.cc
@@@ -75,12 -73,9 +75,13 @@@
  
  #include "bmesh.h"
  
- #include <algorithm>
+ using blender::float3;
+ using blender::MutableSpan;
  
 +using blender::float2;
 +using blender::float3;
 +using blender::IndexRange;
 +using blender::MutableSpan;
  /* -------------------------------------------------------------------- */
  /** \name Sculpt PBVH Abstraction API
   *
diff --cc source/tools
index fdfa2fcb949,3582f5326d0..e1744b9bd82
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit fdfa2fcb9495d87571f2dfe2ae9fa0e032536600
 -Subproject commit 3582f5326d08ca05c2a19056597e49ec5511d854
++Subproject commit e1744b9bd82527cf7e8af63362b61bd309b5711b