Merge branch 'blender-v3.2-release'

This commit is contained in:
Campbell Barton 2022-05-06 13:43:57 +10:00
commit 4dc6d14bdc
1 changed files with 7 additions and 1 deletions

View File

@ -740,7 +740,13 @@ static bool modifier_apply_obdata(
}
else {
Mesh *mesh_applied = modifier_apply_create_mesh_for_modifier(
depsgraph, ob, md_eval, true, true);
depsgraph,
ob,
md_eval,
/* It's important not to apply virtual modifiers (e.g. shape-keys) because they're kept,
* causing them to be applied twice, see: T97758. */
false,
true);
if (!mesh_applied) {
BKE_report(reports, RPT_ERROR, "Modifier returned error, skipping apply");
return false;