diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-11-10 15:53:44 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-11-10 15:53:44 +0300 |
| commit | a6e4cb092eb43b74379f99bdf82baab0db21603e (patch) | |
| tree | 6307aacdbf7bc12e3bfbdbbd6b6e8e2e8c494737 /source/blender/blenkernel/intern/mesh.cc | |
| parent | 53468c2b1351ecff5ea32eb47e14902f3c94a53e (diff) | |
| parent | bc0c06ecbe8cb23221e9cf05be6235e28d4597db (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index a5eafcae839..73e0c2cfa74 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -88,7 +88,7 @@ static void mesh_init_data(ID *id) CustomData_reset(&mesh->pdata); CustomData_reset(&mesh->ldata); - BKE_mesh_runtime_reset(mesh); + BKE_mesh_runtime_init_data(mesh); mesh->face_sets_color_seed = BLI_hash_int(PIL_check_seconds_timer_i() & UINT_MAX); } @@ -168,7 +168,7 @@ static void mesh_free_data(ID *id) 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); } @@ -308,7 +308,9 @@ static void mesh_blend_read_data(BlendDataReader *reader, ID *id) mesh->texflag &= ~ME_AUTOSPACE_EVALUATED; 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 == nullptr) { |