diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-05 06:30:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-05 06:30:30 +0400 |
| commit | d0412a1981266064aab38ca47f5d72ef9192e783 (patch) | |
| tree | 754a541f99f511cb65c66256b7a8dca7d2673279 /source/blender/render | |
| parent | 936af71e9755d1f1aab05576dabb7eea73a962c2 (diff) | |
| parent | 4acab3eb33db20eef89d0159199429c690b0f2df (diff) | |
svn merge ^/trunk/blender -r43864:43887
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/occlusion.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/zbuf.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c index 782e0b59388..669355c9977 100644 --- a/source/blender/render/intern/source/occlusion.c +++ b/source/blender/render/intern/source/occlusion.c @@ -1408,7 +1408,7 @@ static void sample_occ_tree(Render *re, OcclusionTree *tree, OccFace *exclude, f occlusion= (1.0f-correction)*(1.0f-occ); CLAMP(occlusion, 0.0f, 1.0f); if(correction != 0.0f) - occlusion += correction*exp(-occ); + occlusion += correction*expf(-occ); if(env) { /* sky shading using bent normal */ diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 0d5aed7dadb..807a3d7d0eb 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -245,7 +245,7 @@ int testclip(const float v[4]) /* if we set clip flags, the clipping should be at least larger than epsilon. prevents issues with vertices lying exact on borders */ - abs4= fabs(v[3]) + FLT_EPSILON; + abs4= fabsf(v[3]) + FLT_EPSILON; if( v[0] < -abs4) c+=1; else if( v[0] > abs4) c+=2; |