[Bf-blender-cvs] [13c9df10a8f] master: Fix T68710: crash on applying modifier after removing all shape keys

[Philipp Oeser]

Commit: 13c9df10a8fda7b5370edf1c87e4f4da15e4b33b
Author: Philipp Oeser
Date:   Fri Aug 16 12:52:40 2019 +0200
Branches: master
https://developer.blender.org/rB13c9df10a8fda7b5370edf1c87e4f4da15e4b33b

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

===================================================================

M	source/blender/blenkernel/intern/object.c

===================================================================

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)