griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: NaN error in smoothminf function

Browse Source
This commit is contained in:
Charlie Jolly
2019-12-21 03:28:22 +00:00
parent 4d0a91d03d
commit c1242874c9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/util/util_math.h
View File

@@ -363,8 +363,13 @@ ccl_device_inline float pingpongf(float a, float b)
ccl_device_inline float smoothminf(float a, float b, float k)
{
float h = fmaxf(k - fabsf(a - b), 0.0f) / k;
return fminf(a, b) - h * h * h * k * (1.0f / 6.0f);
if (k != 0.0f) {
float h = fmaxf(k - fabsf(a - b), 0.0f) / k;
return fminf(a, b) - h * h * h * k * (1.0f / 6.0f);
}
else {
return fminf(a, b);
}
}
ccl_device_inline float signf(float f)