[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26717] trunk/blender/source/blender/ blenkernel/intern/scene.c: hack, we need a way not to switch some cameras quickly.

[Campbell Barton]

Revision: 26717
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26717
Author:   campbellbarton
Date:     2010-02-08 20:52:34 +0100 (Mon, 08 Feb 2010)

Log Message:
-----------
hack, we need a way not to switch some cameras quickly.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2010-02-08 19:26:13 UTC (rev 26716)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2010-02-08 19:52:34 UTC (rev 26717)
@@ -726,7 +726,7 @@
 	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;