[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29930] trunk/blender/source/blender/ editors/render/render_internal.c: Fix #22028: rendering from 3d view was OR-ing with scene render layers,

[Brecht Van Lommel]

Revision: 29930
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29930
Author:   blendix
Date:     2010-07-04 14:26:46 +0200 (Sun, 04 Jul 2010)

Log Message:
-----------
Fix #22028: rendering from 3d view was OR-ing with scene render layers,
this isn't helpful, so just use 3d view layers.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_internal.c

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2010-07-04 12:24:19 UTC (rev 29929)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2010-07-04 12:26:46 UTC (rev 29930)
@@ -403,7 +403,7 @@
 	Render *re= RE_NewRender(scene->id.name);
 	Image *ima;
 	View3D *v3d= CTX_wm_view3d(C);
-	int lay= (v3d)? v3d->lay|scene->lay: scene->lay;
+	int lay= (v3d)? v3d->lay: scene->lay;
 
 	if(re==NULL) {
 		re= RE_NewRender(scene->id.name);
@@ -666,7 +666,7 @@
 	rj->scene= scene;
 	rj->win= CTX_wm_window(C);
 	rj->srl = srl;
-	rj->lay = (v3d)? v3d->lay|scene->lay: scene->lay;
+	rj->lay = (v3d)? v3d->lay: scene->lay;
 	rj->anim= RNA_boolean_get(op->ptr, "animation");
 	rj->iuser.scene= scene;
 	rj->iuser.ok= 1;