From 72f620fef3b556c2c501640d74edea666f6b9d1a Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sun, 12 Nov 2006 11:03:34 +0000 Subject: [PATCH] Bugfix #5207 Silly error in code initialized envmap "Render" struct wrong. It didn't work for ortho render, so also crashed on previews in ortho 3d window. --- source/blender/render/intern/source/envmap.c | 2 +- source/blender/render/intern/source/initrender.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index c511bc043dc..eb5e92fb7e0 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -135,7 +135,7 @@ static Render *envmap_render_copy(Render *re, EnvMap *env) envre->r.size= 100; envre->r.yasp= envre->r.xasp= 1; - RE_InitState(envre, &re->r, cuberes, cuberes, NULL); + RE_InitState(envre, &envre->r, cuberes, cuberes, NULL); envre->scene= re->scene; /* unsure about this... */ /* view stuff in env render */ diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index a51b4674314..327b04f6c81 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -504,7 +504,7 @@ void RE_SetCamera(Render *re, Object *camera) } /* ortho only with camera available */ - if(re->r.mode & R_ORTHO) { + if(cam && (re->r.mode & R_ORTHO)) { if( (re->r.xasp*re->winx) >= (re->r.yasp*re->winy) ) { re->viewfac= re->winx; }