archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Workaround T61948: Undo steps created for non-paint operations

Browse Source 
Changing the brush size for example,
was adding redundant undo steps in paint-modes.

For now, don't store undo steps for property changes
in paint & edit modes.

While not ideal, this is similar to 2.7x behavior.
This commit is contained in:
Campbell Barton
2019-07-05 13:46:48 +10:00
parent fdcfc263e9
commit 4a08b974f4
3 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/include/ED_undo.h
View File

@@ -54,6 +54,9 @@ bool ED_undo_is_valid(const struct bContext *C, const char *undoname);
bool ED_undo_is_memfile_compatible(const struct bContext *C);
/* Unfortunate workaround for limits mixing undo systems. */
bool ED_undo_is_legacy_compatible_for_property(struct bContext *C, struct ID *id);
void ED_undo_object_editmode_restore_helper(struct bContext *C,
struct Object **object_array,
uint object_array_len,

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

@@ -756,6 +756,14 @@ static void ui_apply_but_undo(uiBut *but)
str = "Unknown Action";
}
/* Optionally override undo when undo system doesn't support storing properties. */
if (but->rnapoin.id.data) {
ID *id = but->rnapoin.id.data;
if (!ED_undo_is_legacy_compatible_for_property(but->block->evil_C, id)) {
str = "";
}
}
/* delayed, after all other funcs run, popups are closed, etc */
after = ui_afterfunc_new();
BLI_strncpy(after->undostr, str, sizeof(after->undostr));

33
source/blender/editors/undo/ed_undo.c
View File

@@ -321,6 +321,39 @@ bool ED_undo_is_memfile_compatible(const bContext *C)
return true;
}
/**
* When a property of ID changes, return false.
*
* This is to avoid changes to a property making undo pushes
* which are ignored by the undo-system.
* For example, changing a brush property isn't stored by sculpt-mode undo steps.
* This workaround is needed until the limitation is removed, see: T61948.
*/
bool ED_undo_is_legacy_compatible_for_property(struct bContext *C, ID *id)
{
ViewLayer *view_layer = CTX_data_view_layer(C);
if (view_layer != NULL) {
Object *obact = OBACT(view_layer);
if (obact != NULL) {
if (obact->mode & OB_MODE_ALL_PAINT) {
/* Don't store property changes when painting
* (only do undo pushes on brush strokes which each paint operator handles on it's own). */
CLOG_INFO(&LOG, 1, "skipping undo for paint-mode");
return false;
}
else if (obact->mode & OB_MODE_EDIT) {
if ((id == NULL) || (obact->data == NULL) ||
(GS(id->name) != GS(((ID *)obact->data)->name))) {
/* No undo push on id type mismatch in edit-mode. */
CLOG_INFO(&LOG, 1, "skipping undo for edit-mode");
return false;
}
}
}
}
return true;
}
/**
* Ideally we wont access the stack directly,
* this is needed for modes which handle undo themselves (bypassing #ED_undo_push).