diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-27 23:18:02 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-27 23:22:13 +0400 |
| commit | 29790d4fcad95ec31c801631c699547673bf7fab (patch) | |
| tree | 93cb044515c7d362ca91092d5c74b5e99250ca29 /source/blender/editors/render | |
| parent | f67dda689349b093ce1d11c2cba5ebb48dba8c45 (diff) | |
Fix T37414: local view not taken into account for blender internal F12 render over 3D view.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 71bf67220fe..e1a271e996b 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 */ |