Cleanup: move internal data handling from Screen 'lib_link' to 'read_data' code.

No behavioral change expected from this commit.
This commit is contained in:
Bastien Montagne 2023-08-17 16:23:24 +02:00
parent a5789eba98
commit 6033edd6b2

@ -128,6 +128,9 @@ bool BKE_screen_blend_read_data(BlendDataReader *reader, bScreen *screen)
screen->regionbase.first = screen->regionbase.last = nullptr; screen->regionbase.first = screen->regionbase.last = nullptr;
screen->context = nullptr; screen->context = nullptr;
screen->active_region = 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); BLO_read_data_address(reader, &screen->preview);
BKE_previewimg_blend_read(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) */ /* deprecated, but needed for versioning (will be nullptr'ed then) */
BLO_read_id_address(reader, id, &screen->scene); 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) { LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
BKE_screen_area_blend_read_lib(reader, &screen->id, area); BKE_screen_area_blend_read_lib(reader, &screen->id, area);
} }