[Bf-blender-cvs] [f5203933f7e] temp-sculpt-cavity-mask: Merge branch 'master' into temp-sculpt-cavity-mask

[Joseph Eagar]

Commit: f5203933f7edcb6a6b7f07ed567bb09dc05b180b
Author: Joseph Eagar
Date:   Sat Jun 11 11:27:17 2022 -0700
Branches: temp-sculpt-cavity-mask
https://developer.blender.org/rBf5203933f7edcb6a6b7f07ed567bb09dc05b180b

Merge branch 'master' into temp-sculpt-cavity-mask

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt_automasking.cc
index ea0684fedff,bb101717c9b..d8d86d70eee
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
@@@ -48,12 -44,10 +48,12 @@@
  
  #include "bmesh.h"
  
- #include <math.h>
- #include <stdlib.h>
+ #include <cmath>
+ #include <cstdlib>
  
  using blender::IndexRange;
 +using blender::Set;
 +using blender::Vector;
  
  AutomaskingCache *SCULPT_automasking_active_cache_get(SculptSession *ss)
  {