[Bf-blender-cvs] [1827f99] master: Fix T46225: Crash when rendering halo flare
Dalai Felinto
noreply at git.blender.org
Wed Sep 23 18:36:57 CEST 2015
Commit: 1827f99a7835628e7cf71b54dbcb21c2132ba664
Author: Dalai Felinto
Date: Wed Sep 23 13:35:01 2015 -0300
Branches: master
https://developer.blender.org/rB1827f99a7835628e7cf71b54dbcb21c2132ba664
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.
===================================================================
M source/blender/render/intern/source/rendercore.c
===================================================================
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 894ade4..910ea16 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;
More information about the Bf-blender-cvs
mailing list