Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-03-25 17:05:36 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-03-25 17:05:36 +0300
commit4fd2f678ea07fcd69dffce10fbfd0b19ccdc3782 (patch)
tree387720caa5a1743b9c1769b8f040e062ff946c79
parent1a866d55acce90406e6430f85f3d88335c4f686d (diff)
Fix T44133 SSAO in OpenGL rendering from orthographic camera did not
work Safe to include in final release
-rw-r--r--source/blender/editors/render/render_opengl.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 402e72db217..d8da0e9bcda 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 {