diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 05:14:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-20 05:14:33 +0400 |
| commit | 3c8d86e117b54914524cbc49a8678ecaad8671cf (patch) | |
| tree | 8101c8b12f888ded58d7e489e7855e754f0cf065 /source/blender/editors/render | |
| parent | 331dd678c75ba1ef4e714c989c8f1bfae35508c2 (diff) | |
| parent | acf30220c9d63e0f060ee69115fe82016de025d4 (diff) | |
svn merge ^/trunk/blender -r41961:41998
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index fa764e6eefc..843918e9173 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -147,7 +147,7 @@ static void screen_opengl_render_apply(OGLRender *oglrender) rctf viewplane; float clipsta, clipend; - int is_ortho= ED_view3d_viewplane_get(v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend, NULL); + int is_ortho= ED_view3d_viewplane_get(v3d, rv3d, sizex, sizey, &viewplane, &clipsta, &clipend); if(is_ortho) orthographic_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, -clipend, clipend); else perspective_m4(winmat, viewplane.xmin, viewplane.xmax, viewplane.ymin, viewplane.ymax, clipsta, clipend); } |