[Bf-blender-cvs] [29790d4] master: Fix T37414: local view not taken into account for blender internal F12 render over 3D view.

[Brecht Van Lommel]

Commit: 29790d4fcad95ec31c801631c699547673bf7fab
Author: Brecht Van Lommel
Date:   Wed Nov 27 20:18:02 2013 +0100
http://developer.blender.org/rB29790d4fcad95ec31c801631c699547673bf7fab

Fix T37414: local view not taken into account for blender internal F12 render over 3D view.

===================================================================

M	source/blender/editors/render/render_internal.c

===================================================================

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 71bf672..e1a271e 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -677,7 +677,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
 			rj->v3d_override = true;
 
 		if (v3d->localvd)
-			rj->lay_override = scene->lay | v3d->localvd->lay;
+			rj->lay_override |= v3d->localvd->lay;
 	}
 
 	/* setup job */