diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-08 22:52:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-08 22:52:34 +0300 |
| commit | 9ffe1c58f88ea8c068dbfc76b86cb53686089349 (patch) | |
| tree | ea5b0f11dd5ee2b6909c22404ec4064de8c6c8df /source/blender/blenkernel/intern/scene.c | |
| parent | 5ed0cc61f5b863a4346f03bb48188604f17e84b1 (diff) | |
hack, we need a way not to switch some cameras quickly.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 780ded2a941..4624fbe40dc 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -726,7 +726,7 @@ Object *scene_find_camera_switch(Scene *scene) Object *camera= NULL; for (m= scene->markers.first; m; m= m->next) { - if(m->camera && (m->frame <= cfra) && (m->frame > frame)) { + if(m->camera && (m->camera->restrictflag & OB_RESTRICT_RENDER)==0 && (m->frame <= cfra) && (m->frame > frame)) { camera= m->camera; frame= m->frame; |