diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 21:59:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 21:59:30 +0400 |
| commit | 51488283564273c5e796d5ca3ded47f2726330e8 (patch) | |
| tree | a6149b89048c7827e7f762e469050dd8d94e7d50 /source/blender/render | |
| parent | 85d99737b5753fd845c3fce0f08e6b5205530195 (diff) | |
| parent | 5cd85ed57ea649c58c7c19d709bfc4cae7fffcad (diff) | |
svn merge ^/trunk/blender -r44235:44250
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pixelshading.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c index 24683ec57f7..9746a6dbd86 100644 --- a/source/blender/render/intern/source/pixelshading.c +++ b/source/blender/render/intern/source/pixelshading.c @@ -161,7 +161,7 @@ static void render_lighting_halo(HaloRen *har, float col_r[3]) copy_v3_v3(lvrot, lv); mul_m3_v3(lar->imat, lvrot); - x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2])); + x = maxf(fabsf(lvrot[0]/lvrot[2]), fabsf(lvrot[1]/lvrot[2])); /* 1.0/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */ inpr= 1.0/(sqrt(1.0f+x*x)); diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 2f620bb96d4..78420aa6ca8 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -1204,7 +1204,7 @@ float lamp_get_visibility(LampRen *lar, const float co[3], float lv[3], float *d copy_v3_v3(lvrot, lv); mul_m3_v3(lar->imat, lvrot); - x= MAX2(fabs(lvrot[0]/lvrot[2]) , fabs(lvrot[1]/lvrot[2])); + x = maxf(fabsf(lvrot[0]/lvrot[2]), fabsf(lvrot[1]/lvrot[2])); /* 1.0f/(sqrt(1+x*x)) is equivalent to cos(atan(x)) */ inpr= 1.0f/(sqrt(1.0f+x*x)); |