svn merge -r 22371:22571 https://svn.blender.org/svnroot/bf-blender/branches/blender2...

[blender-staging.git] / 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 7e9578d179eecfeb0dcb73fa646a7a2056ebd284..94d7651a03c4adf6a7c468c99cb6cc723df82a7c 100644 (file)
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -478,7 +478,7 @@ static void add_filt_passes(RenderLayer *rl, int curmask, int rectx, int offset,
                                col= shr->refr;
                                break;
                        case SCE_PASS_RADIO:
-                               col= shr->rad;
+                               col= NULL; // removed shr->rad;
                                break;
                        case SCE_PASS_NORMAL:
                                col= shr->nor;
@@ -576,7 +576,7 @@ static void add_passes(RenderLayer *rl, int offset, ShadeInput *shi, ShadeResult
                                col= shr->refr;
                                break;
                        case SCE_PASS_RADIO:
-                               col= shr->rad;
+                               col= NULL; // removed shr->rad;
                                break;
                        case SCE_PASS_NORMAL:
                                col= shr->nor;