archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #22028: rendering from 3d view was OR-ing with scene render layers,

Browse Source 
this isn't helpful, so just use 3d view layers.
This commit is contained in:
Brecht Van Lommel
2010-07-04 12:26:46 +00:00
parent 90162cb0cb
commit 3ca7b160a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/render/render_internal.c
View File

@@ -403,7 +403,7 @@ static int screen_render_exec(bContext *C, wmOperator *op)
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 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
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;