diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-04 15:34:44 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-04 15:34:57 +0300 |
| commit | 73c090fe81fcc6f0966681171377412d0b4d1da4 (patch) | |
| tree | 55e533dcd72153d70e52a493aa62953ef8126edb /source/blender | |
| parent | c19f3ea1b263f52add0604f94fde63bb54214dfa (diff) | |
Fix T44594 disable depth of field in wireframe/bounding box modes. We
don't supply depth information in those modes so supporting the effects
does not really make sense
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index da628c32341..57b417ef1d7 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3729,7 +3729,7 @@ static void view3d_main_area_draw_objects(const bContext *C, Scene *scene, View3 #endif /* framebuffer fx needed, we need to draw offscreen first */ - if (v3d->fx_settings.fx_flag) { + if (v3d->fx_settings.fx_flag && v3d->drawtype >= OB_SOLID) { GPUFXSettings fx_settings; BKE_screen_gpu_fx_validate(&v3d->fx_settings); fx_settings = v3d->fx_settings; @@ -3742,9 +3742,6 @@ static void view3d_main_area_draw_objects(const bContext *C, Scene *scene, View3 fx_settings.dof = NULL; } - if (v3d->drawtype < OB_SOLID) - fx_settings.ssao = NULL; - do_compositing = GPU_fx_compositor_initialize_passes(rv3d->compositor, &ar->winrct, &ar->drawrct, &fx_settings); } |