diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-05-09 05:38:29 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-05-09 05:38:29 +0400 |
| commit | 31471f644cb9d9c3b88da1977705724649482a82 (patch) | |
| tree | 46b5c62b475108e1b1a501a21e53846531ead116 /source/blender/render/intern | |
| parent | b1db37dd056d1b2a16e82f1374163de566c2fe10 (diff) | |
| parent | f8f4f73cc5e6dfdc2a4f8864a3e1edc2639e6fb2 (diff) | |
Merged changes in the trunk up to revision 36551.
Conflicts resolved:
source/creator/SConscript
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index b57fe5a8c3b..74ec52c5dbf 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -1729,7 +1729,7 @@ int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr) /* end warning! - Campbell */ shade_ray(&isec, &shi, &shr_t); - fac= isec.dist*isec.dist; + /* fac= isec.dist*isec.dist; */ fac= 1.0f; accum[0]+= fac*(shr_t.diff[0]+shr_t.spec[0]); accum[1]+= fac*(shr_t.diff[1]+shr_t.spec[1]); diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index d8b5055effd..5f5dab94ba3 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -2544,7 +2544,6 @@ void do_material_tex(ShadeInput *shi) } else { /* add or sub */ if(mtex->blendtype==MTEX_SUB) factt= -factt; - else factt= factt; shi->displace[0]+= factt*shi->vn[0]; shi->displace[1]+= factt*shi->vn[1]; shi->displace[2]+= factt*shi->vn[2]; |