Fix crash with wertex and weight modes

Similar to recent sculpt mode.

1 files changed, 4 insertions, 5 deletions

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index a59e2abdb5f..2e9d55a4c6f 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5668,11 +5668,7 @@ void ED_object_sculptmode_enter_ex(
 	/* Make sure derived final from original object does not reference possibly
 	 * freed memory.
 	 */
-	if (ob->derivedFinal != NULL) {
-		ob->derivedFinal->needsFree = true;
-		ob->derivedFinal->release(ob->derivedFinal);
-		ob->derivedFinal = NULL;
-	}
+	BKE_object_free_derived_mesh_caches(ob);
 
 	sculpt_init_session(depsgraph, scene, ob);
 
@@ -5801,6 +5797,9 @@ void ED_object_sculptmode_exit_ex(
 
 	paint_cursor_delete_textures();
 
+	/* Never leave derived meshes behind. */
+	BKE_object_free_derived_mesh_caches(ob);
+
 	/* Flush object mode. */
 	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);
 }