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/blenkernel/intern/scene.c
parent6880a549ba4bb4150c17df196a1d6d24e66d8486 (diff)
Fix T53808: VSE doesn't show scene strip markers
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 0baf611b293..126761ed14b 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1139,6 +1139,10 @@ Object *BKE_scene_camera_find(Scene *sc)
#ifdef DURIAN_CAMERA_SWITCH
Object *BKE_scene_camera_switch_find(Scene *scene)
{
+ if (scene->r.mode & R_NO_CAMERA_SWITCH) {
+ return NULL;
+ }
+
TimeMarker *m;
int cfra = scene->r.cfra;
int frame = -(MAXFRAME + 1);