Commit: 4fd2f678ea07fcd69dffce10fbfd0b19ccdc3782
Author: Antony Riakiotakis
Date: Wed Mar 25 15:05:36 2015 +0100
Branches: master
https://developer.blender.org/rB4fd2f678ea07fcd69dffce10fbfd0b19ccdc3782
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 {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
