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:
authorCampbell Barton <ideasman42@gmail.com>2018-01-18 06:49:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-18 06:49:09 +0300
commit001789d7337a5497a662427369ae9a178f717845 (patch)
tree903f58a158c1f59213a519d891100eec436ee62b /source/blender/blenloader/intern
parent6880a549ba4bb4150c17df196a1d6d24e66d8486 (diff)
Fix T53808: VSE doesn't show scene strip markers
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 39f83062401..08830242279 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6174,7 +6174,12 @@ static void direct_link_scene(FileData *fd, Scene *sce)
}
}
}
-
+
+#ifdef DURIAN_CAMERA_SWITCH
+ /* Runtime */
+ sce->r.mode &= ~R_NO_CAMERA_SWITCH;
+#endif
+
sce->r.avicodecdata = newdataadr(fd, sce->r.avicodecdata);
if (sce->r.avicodecdata) {
sce->r.avicodecdata->lpFormat = newdataadr(fd, sce->r.avicodecdata->lpFormat);