diff options
| author | Campbell Barton <campbell@blender.org> | 2022-03-07 13:35:21 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-03-07 13:35:21 +0300 |
| commit | 57c5f2a50329d6591eea41ac65ec94890c3c33df (patch) | |
| tree | e1025ed2ec5187d1100805815e8d6c2e3d8616b4 /source/blender/editors | |
| parent | 25fc5876d3bb37018adcfe1a1b943b90d45f5f9a (diff) | |
| parent | 72e20785e1e2ed7b15a9765ebb6df646fd32dbff (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_undo.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_undo.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 97f67060c82..3bebcdc9bae 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -602,6 +602,7 @@ static void *undomesh_from_editmesh(UndoMesh *um, BMEditMesh *em, Key *key, Undo .calc_object_remap = false, .update_shapekey_indices = false, .cd_mask_extra = {.vmask = CD_MASK_SHAPE_KEYINDEX}, + .active_shapekey_to_mvert = true, })); um->selectmode = em->selectmode; diff --git a/source/blender/editors/space_image/image_undo.c b/source/blender/editors/space_image/image_undo.c index e9997fe8d42..c3a48abcae1 100644 --- a/source/blender/editors/space_image/image_undo.c +++ b/source/blender/editors/space_image/image_undo.c @@ -557,7 +557,8 @@ static void uhandle_restore_list(ListBase *undo_handles, bool use_init) if (changed) { BKE_image_mark_dirty(image, ibuf); - BKE_image_free_gputextures(image); /* force OpenGL reload */ + /* TODO(jbakker): only mark areas that are actually updated to improve performance. */ + BKE_image_partial_update_mark_full_update(image); if (ibuf->rect_float) { ibuf->userflags |= IB_RECT_INVALID; /* force recreate of char rect */ |