[Bf-blender-cvs] [35092510bae] temp_bmesh_multires: Merge branch 'master' into temp_bmesh_multires

[Joseph Eagar]

Commit: 35092510baed34a26b976fd041f25e5040398773
Author: Joseph Eagar
Date:   Sat Dec 26 04:24:54 2020 -0800
Branches: temp_bmesh_multires
https://developer.blender.org/rB35092510baed34a26b976fd041f25e5040398773

Merge branch 'master' into temp_bmesh_multires

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



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

diff --cc intern/ghost/intern/GHOST_WindowWin32.cpp
index d8a65259f0f,f5088c6505e..2e4fc0c0840
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@@ -1064,10 -983,8 +1015,8 @@@ void GHOST_WindowWin32::initializeWinta
    /* Check if WinTab available by getting system context info. */
    LOGCONTEXT lc = {0};
    if (m_wintab.open && m_wintab.info && m_wintab.queueSizeGet && m_wintab.queueSizeSet &&
 -      m_wintab.info(WTI_DEFSYSCTX, 0, &lc)) {
 +      call_wt_info(m_wintab.info, WTI_DEFSYSCTX, 0, &lc)) {
  
-     /* The pressure and orientation (tilt) */
-     AXIS Pressure, Orientation[3];
      lc.lcPktData = PACKETDATA;
      lc.lcPktMode = PACKETMODE;
      lc.lcMoveMask = PACKETDATA;
diff --cc source/blender/editors/sculpt_paint/sculpt_undo.c
index cd2e82dc722,9677152cf7e..30879b0e4d8
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@@ -1093,7 -1056,10 +1111,10 @@@ static SculptUndoNode *sculpt_undo_allo
    else {
      /* Regular mesh. */
      unode->maxvert = ss->totvert;
-     unode->index = MEM_callocN(sizeof(SculptVertRef) * allvert, "SculptUndoNode.index");
 -
++    
+     const size_t alloc_size = sizeof(*unode->index) * (size_t)allvert;
+     unode->index = MEM_callocN(alloc_size, "SculptUndoNode.index");
+     usculpt->undo_size += alloc_size;
    }
  
    if (ss->deform_modifiers_active) {
diff --cc source/blender/makesrna/intern/rna_brush.c
index a30c297bb00,2af6c04147c..7830820e0f2
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@@ -2839,18 -2831,9 +2839,18 @@@ static void rna_def_brush(BlenderRNA *b
    RNA_def_property_range(prop, 0.0f, 1.0f);
    RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.001, 3);
    RNA_def_property_ui_text(
-       prop, "Autosmooth", "Amount of smoothing to automatically apply to each stroke");
+       prop, "Auto-Smooth", "Amount of smoothing to automatically apply to each stroke");
    RNA_def_property_update(prop, 0, "rna_Brush_update");
  
 +  prop = RNA_def_property(srna, "concave_mask_factor", PROP_FLOAT, PROP_FACTOR);
 +  RNA_def_property_float_sdna(prop, NULL, "concave_mask_factor");
 +  RNA_def_property_float_default(prop, 0);
 +  RNA_def_property_range(prop, 0.0f, 1.0f);
 +  RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.001, 3);
 +  RNA_def_property_ui_text(
 +      prop, "Cavity Mask", "Mask to concave areas");
 +  RNA_def_property_update(prop, 0, "rna_Brush_update");
 +
    prop = RNA_def_property(srna, "topology_rake_factor", PROP_FLOAT, PROP_FACTOR);
    RNA_def_property_float_sdna(prop, NULL, "topology_rake_factor");
    RNA_def_property_float_default(prop, 0);