[Bf-blender-cvs] [1d28ff7f2bd] blender-v2.82-release: Fix T73495: Missing undo switching active shape-key in edit-mode

[Campbell Barton]

Commit: 1d28ff7f2bd100e7921bfc02e9ad20f78847a5be
Author: Campbell Barton
Date:   Thu Jan 30 14:55:54 2020 +1100
Branches: blender-v2.82-release
https://developer.blender.org/rB1d28ff7f2bd100e7921bfc02e9ad20f78847a5be

Fix T73495: Missing undo switching active shape-key in edit-mode

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

M	source/blender/editors/interface/interface_handlers.c

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 43d71ddd047..5dcfcbc88b3 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -791,7 +791,10 @@ static void ui_apply_but_undo(uiBut *but)
       /* Exception for renaming ID data, we always need undo pushes in this case,
        * because undo systems track data by their ID, see: T67002. */
       extern PropertyRNA rna_ID_name;
-      if (but->rnaprop == &rna_ID_name) {
+      /* Exception for active shape-key, since changing this in edit-mode updates
+       * the shape key from object mode data. */
+      extern PropertyRNA rna_Object_active_shape_key_index;
+      if (ELEM(but->rnaprop, &rna_ID_name, &rna_Object_active_shape_key_index)) {
         /* pass */
       }
       else {