diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-03 12:24:21 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-03 12:24:21 +0300 |
commit | 8a84a957f2b0cc95608cda81c2aeb655f1732788 (patch) | |
tree | 225c5df027a1b2eeb8ca4f60f0f47926ec25466a /source/blender/render | |
parent | 066f79cfa4ca23b8fefc8612c3c6c80866549aa9 (diff) |
Orange tree:
Raytrace mirror crash, due to mixup in skyshade call (for 'glob' texture)
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/ray.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/ray.c b/source/blender/render/intern/source/ray.c index df914f96283..761f4e7fe0b 100644 --- a/source/blender/render/intern/source/ray.c +++ b/source/blender/render/intern/source/ray.c @@ -1623,7 +1623,7 @@ static void traceray(short depth, float *start, float *vec, float *col, VlakRen VECCOPY(shi.view, vec); Normalise(shi.view); - shadeSkyPixelFloat(col, shi.view, NULL, isec.start); + shadeSkyPixelFloat(col, NULL, shi.view, isec.start); } } @@ -2118,7 +2118,7 @@ void ray_ao(ShadeInput *shi, World *wrld, float *shadfac) shadfac[2]+= (1.0-fac)*R.wrld.horb + fac*R.wrld.zenb; } else { - shadeSkyPixelFloat(skycol, view, NULL, isec.start); + shadeSkyPixelFloat(skycol, NULL, view, isec.start); shadfac[0]+= skycol[0]; shadfac[1]+= skycol[1]; shadfac[2]+= skycol[2]; |