diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
| commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
| tree | 0cbb1b91fe26c750197126085b74224a795a103c /source/blender/editors/util/ed_util.c | |
| parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
| parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) | |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'source/blender/editors/util/ed_util.c')
| -rw-r--r-- | source/blender/editors/util/ed_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 3cfe6bd61a4..2f268d4ae23 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -61,7 +61,7 @@ void ED_editors_init_for_undo(Main *bmain) wmWindowManager *wm = bmain->wm.first; LISTBASE_FOREACH (wmWindow *, win, &wm->windows) { ViewLayer *view_layer = WM_window_get_active_view_layer(win); - Base *base = BASACT(view_layer); + Base *base = view_layer->basact; if (base != NULL) { Object *ob = base->object; if (ob->mode & OB_MODE_TEXTURE_PAINT) { @@ -176,7 +176,7 @@ void ED_editors_init(bContext *C) } } else { - /* TODO(campbell): avoid operator calls. */ + /* TODO(@campbellbarton): avoid operator calls. */ if (obact == ob) { ED_object_mode_set(C, mode); } |