diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-08-16 18:11:58 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-16 18:11:58 +0400 |
commit | 23807d1fb43de44ca7c4db5dc7bd92178f4b6a14 (patch) | |
tree | 6d2e17c8405789363e69df000cf14207110428b2 /source/blender/render | |
parent | 02d2472baacd8ac091a29392a2bc9ac8693fb5e7 (diff) | |
parent | dddfb5e1738830c325e796a474d0ea14d64654f3 (diff) |
Merging trunk up to r39447.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/rayshade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 34d3adcf15b..d62f411a7c5 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -1679,7 +1679,7 @@ static void ray_trace_shadow_tra(Isect *is, ShadeInput *origshi, int depth, int /* not used, test function for ambient occlusion (yaf: pathlight) */ /* main problem; has to be called within shading loop, giving unwanted recursion */ -static int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr) +static int UNUSED_FUNCTION(ray_trace_shadow_rad)(ShadeInput *ship, ShadeResult *shr) { static int counter=0, only_one= 0; extern float hashvectf[]; |