diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-08-27 06:04:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-27 06:04:29 +0400 |
commit | 9ae67bf38036f15b39ba129bea61415d8cfb95ae (patch) | |
tree | e5e2665f314af2f7652a21385ff6e2f3f5331fc9 /source/blender/render | |
parent | a05d4a729ae6ccf26a7ef5786fdfffde6d2cb5d4 (diff) |
bugfix for procedural textures used as bumpmap with osa not rendering right, also remove redundant assignment.
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/render_texture.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index a4c1778c624..fbbb33d0172 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -1789,7 +1789,7 @@ static int compatible_bump_compute(CompatibleBump *compat_bump, ShadeInput *shi, const float adx[3] = {fabsf(dx[0]), fabsf(dx[1]), fabsf(dx[2])}; const float ady[3] = {fabsf(dy[0]), fabsf(dy[1]), fabsf(dy[2])}; du = MAX3(adx[0], adx[1], adx[2]); - dv = MAX3(ady[1], ady[1], ady[2]); + dv = MAX3(ady[0], ady[1], ady[2]); } } @@ -2358,7 +2358,6 @@ void do_material_tex(ShadeInput *shi) f1= shi->vn[0]; f2= shi->vn[1]; texres.nor[0]= f1*co_nor+f2*si; - texres.nor[1]= f2*co_nor-f1*si; f1= shi->vn[1]; f2= shi->vn[2]; texres.nor[1]= f1*co_nor+f2*si; |