[Bf-blender-cvs] [a6e4cb092eb] master: Merge branch 'blender-v3.0-release'

[Jeroen Bakker]

Commit: a6e4cb092eb43b74379f99bdf82baab0db21603e
Author: Jeroen Bakker
Date:   Wed Nov 10 13:53:44 2021 +0100
Branches: master
https://developer.blender.org/rBa6e4cb092eb43b74379f99bdf82baab0db21603e

Merge branch 'blender-v3.0-release'

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



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

diff --cc source/blender/blenkernel/intern/mesh.cc
index a5eafcae839,f0ba83b396b..73e0c2cfa74
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@@ -165,10 -165,10 +165,10 @@@ static void mesh_free_data(ID *id
        BKE_editmesh_free_data(mesh->edit_mesh);
      }
      MEM_freeN(mesh->edit_mesh);
 -    mesh->edit_mesh = NULL;
 +    mesh->edit_mesh = nullptr;
    }
  
-   BKE_mesh_runtime_clear_cache(mesh);
+   BKE_mesh_runtime_free_data(mesh);
    mesh_clear_geometry(mesh);
    MEM_SAFE_FREE(mesh->mat);
  }
@@@ -307,11 -307,13 +307,13 @@@ static void mesh_blend_read_data(BlendD
    CustomData_blend_read(reader, &mesh->pdata, mesh->totpoly);
  
    mesh->texflag &= ~ME_AUTOSPACE_EVALUATED;
 -  mesh->edit_mesh = NULL;
 +  mesh->edit_mesh = nullptr;
-   BKE_mesh_runtime_reset(mesh);
+ 
+   memset(&mesh->runtime, 0, sizeof(mesh->runtime));
+   BKE_mesh_runtime_init_data(mesh);
  
    /* happens with old files */
 -  if (mesh->mselect == NULL) {
 +  if (mesh->mselect == nullptr) {
      mesh->totselect = 0;
    }