diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-02-19 00:17:01 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-02-19 00:17:01 +0300 |
| commit | 7f68185d347b01a75836eb7372181a1196f546aa (patch) | |
| tree | 935a55de98502bb17fe765bf4db338451333ed22 /source/blender/blenkernel/intern/DerivedMesh.cc | |
| parent | d9d97db018d28f4c1ce7543ba275a9809d56294a (diff) | |
| parent | 3cebfadb27eb4056d28211708158f9ad8a7459b7 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 633873adf33..1ccccf1acf4 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -1827,9 +1827,8 @@ Mesh *mesh_get_eval_final(struct Depsgraph *depsgraph, mesh_eval = BKE_object_get_evaluated_mesh(ob); } - if (mesh_eval != nullptr) { - BLI_assert(!(mesh_eval->runtime.cd_dirty_vert & CD_MASK_NORMAL)); - } + BKE_mesh_assert_normals_dirty_or_calculated(mesh_eval); + return mesh_eval; } |