[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28885] branches/render25/source/blender/ editors/render/render_opengl.c: fixed bug with layers being left out of frame recalc in ogl render

[Joseph Eagar]

Revision: 28885
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28885
Author:   joeedh
Date:     2010-05-20 17:15:48 +0200 (Thu, 20 May 2010)

Log Message:
-----------
fixed bug with layers being left out of frame recalc in ogl render

Modified Paths:
--------------
    branches/render25/source/blender/editors/render/render_opengl.c

Modified: branches/render25/source/blender/editors/render/render_opengl.c
===================================================================
--- branches/render25/source/blender/editors/render/render_opengl.c	2010-05-20 15:09:04 UTC (rev 28884)
+++ branches/render25/source/blender/editors/render/render_opengl.c	2010-05-20 15:15:48 UTC (rev 28885)
@@ -268,17 +268,17 @@
 
 	/* go to next frame */
 	while(CFRA<oglrender->nfra) {
-		if(scene->lay & 0xFF000000)
-			lay= scene->lay & 0xFF000000;
-		else
-			lay= scene->lay;
+		lay = scene->lay | oglrender->v3d->lay;
 
+		if(lay & 0xFF000000)
+			lay &= 0xFF000000;
+
 		scene_update_for_newframe(scene, lay);
 		CFRA++;
 	}
+	
+	scene_update_for_newframe(scene, scene->lay | oglrender->v3d->lay);
 
-	scene_update_for_newframe(scene, scene->lay);
-
 	if(oglrender->rv3d->persp==RV3D_CAMOB && oglrender->v3d->camera && oglrender->v3d->scenelock) {
 		/* since scene_update_for_newframe() is used rather
 		 * then ED_update_for_newframe() the camera needs to be set */