[Bf-blender-cvs] [0f81dafe6ce] blender-v2.93-release: Fix T87010: VSE: adding strips crashes in certain files
Philipp Oeser
noreply at git.blender.org
Fri Apr 16 17:44:03 CEST 2021
Commit: 0f81dafe6cecd17948e6a92fa2d1be9c473038e6
Author: Philipp Oeser
Date: Fri Apr 16 16:41:48 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB0f81dafe6cecd17948e6a92fa2d1be9c473038e6
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
===================================================================
M source/blender/blenloader/intern/versioning_290.c
===================================================================
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();
}
}
More information about the Bf-blender-cvs
mailing list