diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-02-28 21:18:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-02-28 21:18:22 +0300 |
| commit | 96492903aa28f115a51d287c3fd4af667d996f84 (patch) | |
| tree | ba5dab33fa8b81edb05c7bbd426a1d436ba9b9ee /source/blender/blenkernel/intern/DerivedMesh.cc | |
| parent | 8c932ab43c28d476bd0bf671ef70448f075295ef (diff) | |
| parent | 44b0c70919e92f7b70f0e03eba9570ca8906ab90 (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 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 1ccccf1acf4..79a3968b94f 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -1143,12 +1143,7 @@ static void mesh_calc_modifiers(struct Depsgraph *depsgraph, * we need to apply these back onto the Mesh. If we have no * Mesh then we need to build one. */ if (mesh_final == nullptr) { - /* NOTE: this check on cdmask is a bit dodgy, it handles the issue at stake here (see T68211), - * but other cases might require similar handling? - * Could be a good idea to define a proper CustomData_MeshMask for that then. */ - if (deformed_verts == nullptr && allow_shared_mesh && - (final_datamask.lmask & CD_MASK_NORMAL) == 0 && - (final_datamask.pmask & CD_MASK_NORMAL) == 0) { + if (deformed_verts == nullptr && allow_shared_mesh) { mesh_final = mesh_input; } else { |