diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-01-30 07:12:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-30 07:12:33 +0300 |
| commit | 97ace45e42ad3d5633c5b076b61c6ed9b5494f97 (patch) | |
| tree | 121a95b9be2f385e2d6b41e4dd30c888d5ebc092 /source/blender/editors/interface/interface_handlers.c | |
| parent | 4c1b7f311da58269654655359a8bddf439cc8ce9 (diff) | |
| parent | 1d28ff7f2bd100e7921bfc02e9ad20f78847a5be (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -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 c6c19e8d66c..7332f3ee776 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 { |