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

2.5: merge with trunk, previous merge was only up to yesterday.

Browse Source 
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
This commit is contained in:
Brecht Van Lommel
2008-11-12 22:03:11 +00:00
parent bdfe7d89e2 7e4db234ce
commit b3c238e8bc
47 changed files with 3141 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/render/intern/source/pixelshading.c
View File

@@ -511,7 +511,7 @@ static void fillBackgroundImage(float *collector, float fx, float fy)
}
/* Only view vector is important here. Result goes to colf[3] */
void shadeSkyView(float *colf, float *rco, float *view, float *dxyview)
void shadeSkyView(float *colf, float *rco, float *view, float *dxyview, short thread)
{
float lo[3], zen[3], hor[3], blend, blendm;
int skyflag;
@@ -550,7 +550,7 @@ void shadeSkyView(float *colf, float *rco, float *view, float *dxyview)
SWAP(float, lo[1], lo[2]);
}
do_sky_tex(rco, lo, dxyview, hor, zen, &blend, skyflag);
do_sky_tex(rco, lo, dxyview, hor, zen, &blend, skyflag, thread);
}
if(blend>1.0) blend= 1.0;
@@ -607,7 +607,7 @@ void shadeSunView(float *colf, float *view)
/*
Stuff the sky color into the collector.
*/
void shadeSkyPixel(float *collector, float fx, float fy)
void shadeSkyPixel(float *collector, float fx, float fy, short thread)
{
float view[3], dxyview[2];
@@ -653,7 +653,7 @@ void shadeSkyPixel(float *collector, float fx, float fy)
}
/* get sky color in the collector */
shadeSkyView(collector, NULL, view, dxyview);
shadeSkyView(collector, NULL, view, dxyview, thread);
collector[3] = 0.0f;
}