Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-04-16 17:41:48 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-04-16 18:42:10 +0300
commit0f81dafe6cecd17948e6a92fa2d1be9c473038e6 (patch)
tree6940e1de9684573a7871161495261394a2f8752f
parent0bf630493f6a2644dd6c0fc2bf745edd7a86a083 (diff)
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
-rw-r--r--source/blender/blenloader/intern/versioning_290.c2
1 files changed, 1 insertions, 1 deletions
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();
}
}