Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-07-04 16:26:46 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-07-04 16:26:46 +0400
commit3ca7b160a664e74c6815056a4a8596bb4c2b70be (patch)
tree5a4c53b6e404622d699e44775fe8772340d3a32d /source
parent90162cb0cb4ad432a7453c7d5ec7de832a058f16 (diff)
Fix #22028: rendering from 3d view was OR-ing with scene render layers,
this isn't helpful, so just use 3d view layers.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/render/render_internal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 48ad3bbcc94..3634c10e147 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -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;