From 0f81dafe6cecd17948e6a92fa2d1be9c473038e6 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Fri, 16 Apr 2021 16:41:48 +0200 Subject: Fix T87010: VSE: adding strips crashes in certain files Caused by {rB571362642201} where versioning code for new sequencer tool settings was only done for scenes already having sequencer scene->ed. If scene->ed was not present, sequencer tool settings were never initalized for this scene [if the VSE was then used later], leading to crashes in some places. Now just use the versioning code to initalize sequencer tool settings for all scenes not having them yet. Maniphest Tasks: T87010 Differential Revision: https://developer.blender.org/D10996 --- source/blender/blenloader/intern/versioning_290.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index e8a6ee7a583..916c4bf0cad 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -1574,7 +1574,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) } LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { - if (scene->ed != NULL) { + if (scene->toolsettings->sequencer_tool_settings == NULL) { scene->toolsettings->sequencer_tool_settings = SEQ_tool_settings_init(); } } -- cgit v1.2.3