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/renderwin.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/renderwin.c')
-rw-r--r-- | source/blender/src/renderwin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c index 46af717f2e3..f37f412f2a2 100644 --- a/source/blender/src/renderwin.c +++ b/source/blender/src/renderwin.c @@ -1270,7 +1270,7 @@ void BIF_do_ogl_render(View3D *v3d, int anim) winx= (G.scene->r.size*G.scene->r.xsch)/100; winy= (G.scene->r.size*G.scene->r.ysch)/100; - RE_InitState(re, &G.scene->r, winx, winy, NULL); + RE_InitState(re, NULL, &G.scene->r, winx, winy, NULL); /* for now, result is defaulting to floats still... */ rr= RE_GetResult(re); |