Fix T44594 disable depth of field in wireframe/bounding box modes. We
authorAntony Riakiotakis <kalast@gmail.com>
Mon, 4 May 2015 12:34:44 +0000 (14:34 +0200)
committerAntony Riakiotakis <kalast@gmail.com>
Mon, 4 May 2015 12:34:57 +0000 (14:34 +0200)
don't supply depth information in those modes so supporting the effects
does not really make sense

source/blender/editors/space_view3d/view3d_draw.c

index da628c323417586172a56ef898cfb0503a789c32..57b417ef1d76e1841dc51b91bbf424ba253675dc 100644 (file)
@@ -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);
        }