Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-05-06 06:33:21 +0300
committerCampbell Barton <campbell@blender.org>2022-05-06 06:40:54 +0300
commit929a21060851e75b18a54a8c388b472d77ce4abb (patch)
tree1a818b97c2a2402d831e4ac04ef2d1b2abe605a8 /source/blender/editors/object/object_modifier.cc
parent1b566b70c1636c9b95f55e2fc84ef4f714306d19 (diff)
Fix T97758: Applying modifiers bakes shape-keys
Regression in [0] which is useful when applying modifiers as a shape-key but not when applying modifiers which keeps the existing shape-keys. [0]: 65c5ebf5779d07fb92fabd0ff992337f6c980cde
Diffstat (limited to 'source/blender/editors/object/object_modifier.cc')
-rw-r--r--source/blender/editors/object/object_modifier.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc
index 3328fe65f2e..eed0a63565e 100644
--- a/source/blender/editors/object/object_modifier.cc
+++ b/source/blender/editors/object/object_modifier.cc
@@ -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;