diff --git a/source/blender/blenloader/intern/versioning_500.cc b/source/blender/blenloader/intern/versioning_500.cc index 6464f59d292..108430b7645 100644 --- a/source/blender/blenloader/intern/versioning_500.cc +++ b/source/blender/blenloader/intern/versioning_500.cc @@ -3965,6 +3965,19 @@ void blo_do_versions_500(FileData *fd, Library * /*lib*/, Main *bmain) } } + if (!MAIN_VERSION_FILE_ATLEAST(bmain, 500, 108)) { + LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { + if (sl->spacetype == SPACE_IMAGE) { + SpaceImage *sima = reinterpret_cast(sl); + sima->iuser.flag &= ~IMA_SHOW_SEQUENCER_SCENE; + } + } + } + } + } + /** * Always bump subversion in BKE_blender_version.h when adding versioning * code here, and wrap it inside a MAIN_VERSION_FILE_ATLEAST check. diff --git a/source/blender/editors/space_image/space_image.cc b/source/blender/editors/space_image/space_image.cc index 6603796b1fb..c6cfca0830e 100644 --- a/source/blender/editors/space_image/space_image.cc +++ b/source/blender/editors/space_image/space_image.cc @@ -76,8 +76,10 @@ static void image_scopes_tag_refresh(ScrArea *area) static void image_user_refresh_scene(const bContext *C, SpaceImage *sima) { /* Update scene image user for acquiring render results. */ - sima->iuser.scene = (sima->iuser.flag & IMA_SHOW_SEQUENCER_SCENE) ? CTX_data_sequencer_scene(C) : - CTX_data_scene(C); + Scene *sequencer_scene = CTX_data_sequencer_scene(C); + sima->iuser.scene = (sima->iuser.flag & IMA_SHOW_SEQUENCER_SCENE) && sequencer_scene ? + sequencer_scene : + CTX_data_scene(C); if (sima->image && sima->image->type == IMA_TYPE_R_RESULT) { /* While rendering, prefer scene that is being rendered. */