From 6033edd6b2e480050ad9a4a2b82eef0aeb423f99 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 17 Aug 2023 16:23:24 +0200 Subject: [PATCH] Cleanup: move internal data handling from Screen 'lib_link' to 'read_data' code. No behavioral change expected from this commit. --- source/blender/blenkernel/intern/screen.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/blender/blenkernel/intern/screen.cc b/source/blender/blenkernel/intern/screen.cc index b769a34b5fe..950e18c84b9 100644 --- a/source/blender/blenkernel/intern/screen.cc +++ b/source/blender/blenkernel/intern/screen.cc @@ -128,6 +128,9 @@ bool BKE_screen_blend_read_data(BlendDataReader *reader, bScreen *screen) screen->regionbase.first = screen->regionbase.last = nullptr; screen->context = nullptr; screen->active_region = nullptr; + screen->animtimer = nullptr; /* saved in rare cases */ + screen->tool_tip = nullptr; + screen->scrubbing = false; BLO_read_data_address(reader, &screen->preview); BKE_previewimg_blend_read(reader, screen->preview); @@ -148,10 +151,6 @@ static void screen_blend_read_lib(BlendLibReader *reader, ID *id) /* deprecated, but needed for versioning (will be nullptr'ed then) */ BLO_read_id_address(reader, id, &screen->scene); - screen->animtimer = nullptr; /* saved in rare cases */ - screen->tool_tip = nullptr; - screen->scrubbing = false; - LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { BKE_screen_area_blend_read_lib(reader, &screen->id, area); }