[Bf-blender-cvs] [33f9b6d0163] blender2.8: Depsgraph: Fix crash editing mesh in edit mode

Sergey Sharybin noreply at git.blender.org
Thu Aug 24 16:01:33 CEST 2017


Commit: 33f9b6d0163f72945c3889c6e5ccb75d22a68113
Author: Sergey Sharybin
Date:   Thu Aug 24 16:01:08 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB33f9b6d0163f72945c3889c6e5ccb75d22a68113

Depsgraph: Fix crash editing mesh in edit mode

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

M	source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc

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

diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 7e4653ddda5..63b52af7c70 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -826,6 +826,12 @@ ID *deg_update_copy_on_write_datablock(const Depsgraph *depsgraph,
 			 */
 			if (object->type == OB_MESH) {
 				object->data = mesh_evaluated;
+				/* Evaluated mesh simply copied edit_btmesh pointer from
+				 * original mesh during update, need to make sure no dead
+				 * pointers are left behind.
+				 */
+				mesh_evaluated->edit_btmesh =
+				        ((Mesh *)mesh_evaluated->id.newid)->edit_btmesh;
 			}
 		}
 	}



More information about the Bf-blender-cvs mailing list