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:
authorPhilipp Oeser <info@graphics-engineer.com>2019-08-16 13:52:40 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-08-16 14:58:47 +0300
commit13c9df10a8fda7b5370edf1c87e4f4da15e4b33b (patch)
treea056ccd0f45c9f91199ce39fcfb299890a99aaf6
parentf8920bd8c7757af976404572697b69372f542df2 (diff)
Fix T68710: crash on applying modifier after removing all shape keys
This was a mistake in rB87629b2a7443 `BKE_object_shapekey_free` would never return `true`, so DEG updates would not happen... So `ob->shapenr` was not up-to-date etc., leading to crash in `BKE_mesh_nomain_to_mesh` shapekey handling... Reviewers: brecht Maniphest Tasks: T68710 Differential Revision: https://developer.blender.org/D5501
-rw-r--r--source/blender/blenkernel/intern/object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index d95c02cdf7f..ae091f32fbf 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3587,7 +3587,7 @@ bool BKE_object_shapekey_free(Main *bmain, Object *ob)
BKE_id_free_us(bmain, key);
- return false;
+ return true;
}
bool BKE_object_shapekey_remove(Main *bmain, Object *ob, KeyBlock *kb)