diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-16 14:20:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-16 14:20:14 +0300 |
| commit | 093451e33dac8f2935f2f843907991c38384da86 (patch) | |
| tree | 1c3f0efae484f671170705ab5a3649897e4b6ada /source/blender/editors | |
| parent | dc14629b26cafcb390137b01cc7d3f13efc67d40 (diff) | |
Fix own error w/ camera-dof in GL-render commit
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 85180eedebd..3bb53bcc9ef 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3305,13 +3305,10 @@ ImBuf *ED_view3d_draw_offscreen_imbuf( const bool own_ofs = (ofs == NULL); /* view state */ - GPUFXSettings fx_settings = {NULL}; + GPUFXSettings fx_settings = v3d->fx_settings; bool is_ortho = false; float winmat[4][4]; - if (UNLIKELY(v3d == NULL)) - return NULL; - if (own_ofs) { /* state changes make normal drawing go weird otherwise */ glPushAttrib(GL_LIGHTING_BIT); @@ -3354,8 +3351,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf( rctf viewplane; float clipsta, clipend; - fx_settings = v3d->fx_settings; - is_ortho = ED_view3d_viewplane_get(v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend, NULL); if (is_ortho) { orthographic_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, -clipend, clipend); |