blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Merge branch 'blender-v2.82-release'

This commit is contained in:
Campbell Barton 2020-01-30 15:12:33 +11:00
parent 4c1b7f311d 1d28ff7f2b
commit 97ace45e42
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/interface_handlers.c
View File

@ -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 {