archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merging trunk up to r39447.

Browse Source
This commit is contained in:
Joerg Mueller
2011-08-16 14:11:58 +00:00
parent 02d2472baa dddfb5e173
commit 23807d1fb4
177 changed files with 1940 additions and 1549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/intern/source/rayshade.c
View File

@@ -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[];