diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-01 14:14:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-01 14:14:09 +0400 |
| commit | 1093f69e506e56e0bf605c44aefc34d6f9bc27fe (patch) | |
| tree | d639e38ba6021c1e307bca0ba31a54f47a1fdec4 /source/blender/render | |
| parent | b6ec6e5ca54ae7d5747f7aa6412be1ab6103ce2d (diff) | |
Style Cleanup
- duplicate cases in if/else
- calc inside sizeof(...)
- redundant NULL checks.
- assignment to self.
- fix error getting text prefix for screen ID button.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 1 |
1 files changed, 0 insertions, 1 deletions
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]; |