[Bf-blender-cvs] [e6c9254c1c6] temp-vert-normals-cleanup: Merge branch 'master' into temp-vert-normals-cleanup

[Hans Goudey]

Commit: e6c9254c1c62827c6bcdd057ce365ec301f6dc1b
Author: Hans Goudey
Date:   Mon Dec 27 23:43:02 2021 -0600
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rBe6c9254c1c62827c6bcdd057ce365ec301f6dc1b

Merge branch 'master' into temp-vert-normals-cleanup

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



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

diff --cc source/blender/blenkernel/intern/customdata.cc
index 8e3d9bd434c,30ba3500c5d..b650b3b691d
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@@ -1518,21 -1543,21 +1519,21 @@@ static const LayerTypeInfo LAYERTYPEINF
      {sizeof(float[3]),
       "vec3f",
       1,
-      NULL,
-      NULL,
-      NULL,
+      nullptr,
+      nullptr,
+      nullptr,
       layerInterp_normal,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
+      nullptr,
+      nullptr,
 -     layerValidate_normal,
++     nullptr,
+      nullptr,
+      nullptr,
+      nullptr,
+      nullptr,
+      nullptr,
       layerCopyValue_normal},
      /* 9: CD_FACEMAP */
-     {sizeof(int), "", 0, NULL, NULL, NULL, NULL, NULL, layerDefault_fmap, NULL},
+     {sizeof(int), "", 0, nullptr, nullptr, nullptr, nullptr, nullptr, layerDefault_fmap, nullptr},
      /* 10: CD_PROP_FLOAT */
      {sizeof(MFloatProperty),
       "MFloatProperty",
diff --cc source/blender/blenkernel/intern/mesh_normals.cc
index 7bc70319c05,47ea55be871..06fe054b1f6
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@@@ -408,9 -319,9 +408,10 @@@ const float (*BKE_mesh_poly_normals_ens
  void BKE_mesh_ensure_normals_for_display(Mesh *mesh)
  {
    switch ((eMeshWrapperType)mesh->runtime.wrapper_type) {
+     case ME_WRAPPER_TYPE_SUBD:
      case ME_WRAPPER_TYPE_MDATA:
 -      /* Run code below. */
 +      BKE_mesh_vertex_normals_ensure(mesh);
 +      BKE_mesh_poly_normals_ensure(mesh);
        break;
      case ME_WRAPPER_TYPE_BMESH: {
        struct BMEditMesh *em = mesh->edit_mesh;