diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 05:50:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 05:50:22 +0400 |
| commit | 130b4429b0279b8be8afa3ce45e60a359b723add (patch) | |
| tree | 8b72d8827d499b74b71e24151844379c96f7e2ba /source/blender/render | |
| parent | 0811236da2d5c709e274d9442fd6fbda471c2136 (diff) | |
| parent | e06f206450b634737e3d2b310d1c702a994f28fe (diff) | |
svn merge -r41638:41648 ^/trunk/blender
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/occlusion.c | 4 |
1 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 7434425d24b..0984c9e784f 100644 --- a/source/blender/render/intern/source/occlusion.c +++ b/source/blender/render/intern/source/occlusion.c @@ -321,7 +321,7 @@ static void occ_face(const OccFace *face, float co[3], float normal[3], float *a if(co) { if(vlr->v4) - interp_v3_v3v3(co, vlr->v1->co, vlr->v3->co, 0.5f); + mid_v3_v3v3(co, vlr->v1->co, vlr->v3->co); else cent_tri_v3(co, vlr->v1->co, vlr->v2->co, vlr->v3->co); @@ -1623,7 +1623,7 @@ static void *exec_strandsurface_sample(void *data) if(face[3]) { co4= mesh->co[face[3]]; - interp_v3_v3v3(co, co1, co3, 0.5f); + mid_v3_v3v3(co, co1, co3); normal_quad_v3( n,co1, co2, co3, co4); } else { |