diff options
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 4 | ||||
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index ec3f199174d..2b3493ade92 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -1554,8 +1554,8 @@ void render_view3d_draw(RenderEngine *engine, const bContext *C) glColor4f(1.0f, 1.0f, 1.0f, 1.0f); glPixelZoom(scale_x, scale_y); glaDrawPixelsAuto(xof, yof, rres.rectx, rres.recty, - GL_RGBA, GL_UNSIGNED_BYTE, - GL_NEAREST, display_buffer); + GL_RGBA, GL_UNSIGNED_BYTE, GL_NEAREST, + 1.0f, display_buffer); glPixelZoom(1.0f, 1.0f); glDisable(GL_BLEND); diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index c718dfa9229..7da5f41ff2c 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -360,6 +360,7 @@ static void screen_opengl_render_doit(OGLRender *oglrender, RenderResult *rr) } else is_persp = true; + BKE_camera_to_gpu_dof(camera, &fx_settings); } else { |