[Bf-blender-cvs] [76f374052c1] blender2.8: Depsgraph: Fix freeing of evaluated mesh

Sergey Sharybin noreply at git.blender.org
Fri Jan 19 14:20:29 CET 2018


Commit: 76f374052c17c61239e1487048eb3229ff72053a
Author: Sergey Sharybin
Date:   Fri Jan 19 14:19:49 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB76f374052c17c61239e1487048eb3229ff72053a

Depsgraph: Fix freeing of evaluated mesh

Was accessing wrong pointer to get original version of the mesh.

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

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

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 923cea6acff..9d752b59abe 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -356,7 +356,7 @@ void BKE_object_free_derived_caches(Object *ob)
 
 	if (ob->mesh_evaluated != NULL) {
 		/* Restore initial pointer. */
-		ob->data = ob->mesh_evaluated->id.newid;
+		ob->data = ob->mesh_evaluated->id.orig_id;
 		/* Evaluated mesh points to edit mesh, but does not own it. */
 		ob->mesh_evaluated->edit_btmesh = NULL;
 		BKE_mesh_free(ob->mesh_evaluated);



More information about the Bf-blender-cvs mailing list