diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-08 04:37:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-08 04:37:22 +0300 |
| commit | 0ba143a1d67561f581fcfa7bc7a10e38a44efefe (patch) | |
| tree | f6563bdf30f4e6bb502440e095b31437851e5f46 /source/blender/draw | |
| parent | a3906edcaf6585fd37d752b9d6d9177d9dd562f6 (diff) | |
Fix T62095: OpenGL render camera image alignment
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 4b99210317f..916cea87474 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1439,7 +1439,10 @@ void DRW_draw_render_loop_ex( Scene *scene = DEG_get_evaluated_scene(depsgraph); ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph); RegionView3D *rv3d = ar->regiondata; - bool do_annotations = (((v3d->flag2 & V3D_SHOW_ANNOTATION) != 0) && ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0)); + const bool do_annotations = ( + ((v3d->flag2 & V3D_SHOW_ANNOTATION) != 0) && + ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0)); + const bool do_camera_frame = !DST.options.is_image_render; DST.draw_ctx.evil_C = evil_C; DST.viewport = viewport; @@ -1535,7 +1538,7 @@ void DRW_draw_render_loop_ex( GPU_framebuffer_bind(DST.default_framebuffer); if (do_bg_image) { - ED_view3d_draw_bgpic_test(scene, depsgraph, ar, v3d, false, true); + ED_view3d_draw_bgpic_test(scene, depsgraph, ar, v3d, false, do_camera_frame); } DRW_draw_callbacks_pre_scene(); @@ -1610,7 +1613,7 @@ void DRW_draw_render_loop_ex( DRW_stats_reset(); if (do_bg_image) { - ED_view3d_draw_bgpic_test(scene, depsgraph, ar, v3d, true, true); + ED_view3d_draw_bgpic_test(scene, depsgraph, ar, v3d, true, do_camera_frame); } if (G.debug_value > 20 && G.debug_value < 30) { |