[Bf-blender-cvs] [093451e] master: Fix own error w/ camera-dof in GL-render commit

[Campbell Barton]

Commit: 093451e33dac8f2935f2f843907991c38384da86
Author: Campbell Barton
Date:   Mon Nov 16 22:20:14 2015 +1100
Branches: master
https://developer.blender.org/rB093451e33dac8f2935f2f843907991c38384da86

Fix own error w/ camera-dof in GL-render commit

===================================================================

M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 85180ee..3bb53bc 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);