diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-11 14:00:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-11 14:00:09 +0300 |
| commit | c5c53b0f2df4d9eeae6564fa3e2e500bef2d8d15 (patch) | |
| tree | 7258ffcc3ec60c338494cde6336c79a8a93eb531 /source/blender/src/previewrender.c | |
| parent | db3f203cb9cf339b64dc1a0435634d21c591c202 (diff) | |
Bugfix: FSA enabled in compositing scene but disabled in other
scenes could crash, there was code to make sure osa level is
the same in all scenes, but that was set too late, after sample
tables are created.
Fix for some unitinialized vector warnings with FSA, these were
harmless, unfortunately.
Diffstat (limited to 'source/blender/src/previewrender.c')
| -rw-r--r-- | source/blender/src/previewrender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c index 383b73b7619..00ae72d95d1 100644 --- a/source/blender/src/previewrender.c +++ b/source/blender/src/previewrender.c @@ -463,7 +463,7 @@ void BIF_previewrender(struct ID *id, struct RenderInfo *ri, struct ScrArea *are } /* allocates render result */ - RE_InitState(re, &sce->r, ri->pr_rectx, ri->pr_recty, NULL); + RE_InitState(re, NULL, &sce->r, ri->pr_rectx, ri->pr_recty, NULL); /* enforce preview image clear */ if(GS(id->name)==ID_MA) { @@ -780,7 +780,7 @@ void BIF_view3d_previewrender(ScrArea *sa) rdata.layers.first= rdata.layers.last= NULL; rdata.renderer= R_INTERN; - RE_InitState(re, &rdata, sa->winx, sa->winy, &ri->disprect); + RE_InitState(re, NULL, &rdata, sa->winx, sa->winy, &ri->disprect); if(orth) RE_SetOrtho(re, &viewplane, clipsta, clipend); |