diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-02-25 08:08:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-25 08:13:53 +0300 |
| commit | b073e59d4e0de2a22c0a15ded1df4d29c0fa7a8e (patch) | |
| tree | 0875835aa4356084c8f680af62c2ae60be3ec643 /source/blender/editors/undo | |
| parent | e301f3422d9922598e0cabf12a4e22eda0ae0880 (diff) | |
Fix T85975: Edit-mode undo/redo removes overlays
Setting the active object when decoding undo steps missed
a call to ED_object_base_active_refresh.
Diffstat (limited to 'source/blender/editors/undo')
| -rw-r--r-- | source/blender/editors/undo/ed_undo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index baa178a6a94..2e5d233f207 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -846,16 +846,15 @@ void ED_OT_undo_history(wmOperatorType *ot) /** \name Undo Helper Functions * \{ */ -void ED_undo_object_set_active_or_warn(ViewLayer *view_layer, - Object *ob, - const char *info, - CLG_LogRef *log) +void ED_undo_object_set_active_or_warn( + Scene *scene, ViewLayer *view_layer, Object *ob, const char *info, CLG_LogRef *log) { Object *ob_prev = OBACT(view_layer); if (ob_prev != ob) { Base *base = BKE_view_layer_base_find(view_layer, ob); if (base != NULL) { view_layer->basact = base; + ED_object_base_active_refresh(G_MAIN, scene, view_layer); } else { /* Should never fail, may not crash but can give odd behavior. */ |