From 441f6cf0206c7ee029f618fdab25a4e7adfacc91 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 19 Sep 2019 14:09:49 +0200 Subject: Fix T64855: smooth view not working in Eevee rendered mode --- source/blender/editors/space_view3d/space_view3d.c | 2 +- source/blender/editors/space_view3d/view3d_view.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_view3d') diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index f398a122e61..f5963684395 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -581,7 +581,7 @@ static void view3d_lightcache_update(bContext *C) Scene *scene = CTX_data_scene(C); - if (strcmp(scene->r.engine, RE_engine_id_BLENDER_EEVEE) != 0) { + if (!BKE_scene_uses_blender_eevee(scene)) { /* Only do auto bake if eevee is the active engine */ return; } diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index e5e1b1297f6..918b4b9eace 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -196,8 +196,8 @@ void ED_view3d_smooth_view_ex( sms.to_camera = true; /* restore view3d values in end */ } - /* skip smooth viewing for render engine draw */ - if (smooth_viewtx && v3d->shading.type != OB_RENDER) { + /* skip smooth viewing for external render engine draw */ + if (smooth_viewtx && !(v3d->shading.type == OB_RENDER && rv3d->render_engine)) { bool changed = false; /* zero means no difference */ if (sview->camera_old != sview->camera) { -- cgit v1.2.3