From 1f58b0bbf7e822f49a13bf26bd01c8df396a9e66 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 9 Sep 2020 08:31:49 +0200 Subject: Fix T80530: Crash when switching to Edit Mode caused by recent merge {33ac3582bbd5} --- source/blender/draw/intern/draw_cache_extract_mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index 2ac5a7b018c..780e4fdea7c 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -152,8 +152,8 @@ static MeshRenderData *mesh_render_data_create(Mesh *me, BLI_assert(me->edit_mesh->mesh_eval_cage && me->edit_mesh->mesh_eval_final); mr->bm = me->edit_mesh->bm; mr->edit_bmesh = me->edit_mesh; - mr->edit_data = is_mode_active ? mr->me->runtime.edit_data : NULL; mr->me = (do_final) ? me->edit_mesh->mesh_eval_final : me->edit_mesh->mesh_eval_cage; + mr->edit_data = is_mode_active ? mr->me->runtime.edit_data : NULL; bool use_mapped = is_mode_active && (!do_uvedit && mr->me && !mr->me->runtime.is_original); -- cgit v1.2.3