[Bf-blender-cvs] [b2a3796] blender-v2.74-release: Fix T44133 SSAO in OpenGL rendering from orthographic camera did not work

Antony Riakiotakis noreply at git.blender.org
Thu Mar 26 12:19:39 CET 2015


Commit: b2a3796b2d4e44890810f5204cd4209b64238ad0
Author: Antony Riakiotakis
Date:   Wed Mar 25 15:05:36 2015 +0100
Branches: blender-v2.74-release
https://developer.blender.org/rBb2a3796b2d4e44890810f5204cd4209b64238ad0

Fix T44133 SSAO in OpenGL rendering from orthographic camera did not
work

Safe to include in final release

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

M	source/blender/editors/render/render_opengl.c

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

diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 402e72d..d8da0e9 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -223,7 +223,12 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
 			/*int is_ortho = scene->r.mode & R_ORTHO;*/
 			camera = v3d->camera;
 			RE_GetCameraWindow(oglrender->re, camera, scene->r.cfra, winmat);
-			is_persp = true;
+			if (camera->type == OB_CAMERA) {
+				Camera *cam = camera->data;
+				is_persp = cam->type == CAM_PERSP;
+			}
+			else
+				is_persp = true;
 			BKE_camera_to_gpu_dof(camera, &fx_settings);
 		}
 		else {




More information about the Bf-blender-cvs mailing list