[Bf-blender-cvs] [4ffd153dbf9] blender2.8: Fix crash when doing Sculpt->Edit->Sculpt switch.

Bastien Montagne noreply at git.blender.org
Mon Jun 11 18:58:35 CEST 2018


Commit: 4ffd153dbf919b40c4b6513c8de2a10dbe9291f6
Author: Bastien Montagne
Date:   Mon Jun 11 18:56:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4ffd153dbf919b40c4b6513c8de2a10dbe9291f6

Fix crash when doing Sculpt->Edit->Sculpt switch.

We actually get fully rid of BKE_object_free_derived_mesh_caches usages,
now always using BKE_object_free_derived_caches (bad name, btw, should
be 'evaluated_caches ;) )...

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

M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 1c76f20d45c..f3fe04f7714 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5666,7 +5666,7 @@ void ED_object_sculptmode_enter_ex(
 	/* Make sure derived final from original object does not reference possibly
 	 * freed memory.
 	 */
-	BKE_object_free_derived_mesh_caches(ob);
+	BKE_object_free_derived_caches(ob);
 
 	sculpt_init_session(depsgraph, scene, ob);
 
@@ -5796,7 +5796,7 @@ void ED_object_sculptmode_exit_ex(
 	paint_cursor_delete_textures();
 
 	/* Never leave derived meshes behind. */
-	BKE_object_free_derived_mesh_caches(ob);
+	BKE_object_free_derived_caches(ob);
 
 	/* Flush object mode. */
 	DEG_id_tag_update(&ob->id, DEG_TAG_COPY_ON_WRITE);



More information about the Bf-blender-cvs mailing list