diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-23 19:35:01 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-23 19:37:01 +0300 |
| commit | 1827f99a7835628e7cf71b54dbcb21c2132ba664 (patch) | |
| tree | 1ec7e5ec04ccf811db06dc8e7ebefa87f21df4be /source | |
| parent | d0a2a8086c1b0002f7105eeec3cd3e5fb5691fb4 (diff) | |
Fix T46225: Crash when rendering halo flare
Error introduced in the multiview commit.
Also bringing back the "continue" statement instead of "return", as it
was before multiview.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 894ade42a1f..910ea16607e 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1971,9 +1971,9 @@ void add_halo_flare(Render *re) rect = RE_RenderLayerGetPass(rl, SCE_PASS_COMBINED, re->viewname); - if (rl==NULL || rect) - return; - + if (rect==NULL) + continue; + mode= R.r.mode; R.r.mode &= ~R_PANORAMA; |