blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

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

This commit is contained in:
Campbell Barton 2015-11-16 22:20:14 +11:00
parent dc14629b26
commit 093451e33d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -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);