[Bf-blender-cvs] [c7a9f76149d] master: Merge branch 'blender-v3.1-release'

[Hans Goudey]

Commit: c7a9f76149d85dfb64710722a45979f6decedbb1
Author: Hans Goudey
Date:   Tue Feb 22 12:47:05 2022 -0500
Branches: master
https://developer.blender.org/rBc7a9f76149d85dfb64710722a45979f6decedbb1

Merge branch 'blender-v3.1-release'

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



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

diff --cc source/blender/blenkernel/intern/customdata.cc
index 867bdcd06bd,0935a902c3a..587c0b73dff
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@@ -1958,11 -1985,25 +1958,11 @@@ const CustomData_MeshMasks CD_MASK_BMES
      (CD_MASK_MDISPS | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_CUSTOMLOOPNORMAL |
       CD_MASK_GRID_PAINT_MASK | CD_MASK_PROP_ALL),
  };
 -/**
 - * cover values copied by #mesh_loops_to_tessdata
 - */
 -const CustomData_MeshMasks CD_MASK_FACECORNERS = {
 -    /* vmask */ 0,
 -    /* emask */ 0,
 -    /* fmask */
 -    (CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_PREVIEW_MCOL | CD_MASK_ORIGSPACE |
 -     CD_MASK_TESSLOOPNORMAL | CD_MASK_TANGENT),
 -    /* pmask */ 0,
 -    /* lmask */
 -    (CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_PREVIEW_MLOOPCOL | CD_MASK_ORIGSPACE_MLOOP |
 -     CD_MASK_NORMAL | CD_MASK_MLOOPTANGENT),
 -};
  const CustomData_MeshMasks CD_MASK_EVERYTHING = {
-     /* vmask */ (CD_MASK_MVERT | CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_NORMAL |
-                  CD_MASK_MDEFORMVERT | CD_MASK_BWEIGHT | CD_MASK_MVERT_SKIN | CD_MASK_ORCO |
-                  CD_MASK_CLOTH_ORCO | CD_MASK_SHAPEKEY | CD_MASK_SHAPE_KEYINDEX |
-                  CD_MASK_PAINT_MASK | CD_MASK_PROP_ALL | CD_MASK_PROP_COLOR | CD_MASK_CREASE),
+     /* vmask */ (CD_MASK_MVERT | CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_MDEFORMVERT |
+                  CD_MASK_BWEIGHT | CD_MASK_MVERT_SKIN | CD_MASK_ORCO | CD_MASK_CLOTH_ORCO |
+                  CD_MASK_SHAPEKEY | CD_MASK_SHAPE_KEYINDEX | CD_MASK_PAINT_MASK |
+                  CD_MASK_PROP_ALL | CD_MASK_PROP_COLOR | CD_MASK_CREASE),
      /* emask */
      (CD_MASK_MEDGE | CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_BWEIGHT | CD_MASK_CREASE |
       CD_MASK_FREESTYLE_EDGE | CD_MASK_PROP_ALL),