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:43:57 +0300
committerCampbell Barton <campbell@blender.org>2022-05-06 06:43:57 +0300
commit4dc6d14bdc61ffe8016c940d99d189af945550cb (patch)
tree524f3dcf24c8a1708e96c3d56d9916f887046f4a
parent11f3a388ed2a72abd12d3f16d08f0ca8a82840be (diff)
parent929a21060851e75b18a54a8c388b472d77ce4abb (diff)
Merge branch 'blender-v3.2-release'
-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;