diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-01-30 06:55:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-30 07:02:25 +0300 |
| commit | 1d28ff7f2bd100e7921bfc02e9ad20f78847a5be (patch) | |
| tree | 45c4516960b783cd20dc1f9567d2d94692307fae | |
| parent | 7a27f64ecb5ac4c6cac3a27436d7b25037e62054 (diff) | |
Fix T73495: Missing undo switching active shape-key in edit-mode
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 { |