diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-16 02:55:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-16 02:55:10 +0400 |
| commit | d9c9209608c59cb5f93c4d781b418d868765b94c (patch) | |
| tree | 2fd78fefd410b5357cb6382c4c35c5df2fc4fa95 /source/blender/blenlib/intern/noise.c | |
| parent | 6379dea41c60521264ee5faf882fbcbc81ce0c45 (diff) | |
code cleanup: quiet some -Wshadow warnings, mix of obvious mistakes and harmless global/local naming conflict.
Diffstat (limited to 'source/blender/blenlib/intern/noise.c')
| -rw-r--r-- | source/blender/blenlib/intern/noise.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index c159f707b98..6e52145c653 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -281,9 +281,9 @@ static float npfade(float t) return (t * t * t * (t * (t * 6.0f - 15.0f) + 10.0f)); } -static float grad(int hash, float x, float y, float z) +static float grad(int hash_val, float x, float y, float z) { - int h = hash & 15; /* CONVERT LO 4 BITS OF HASH CODE */ + int h = hash_val & 15; /* CONVERT LO 4 BITS OF HASH CODE */ float u = h < 8 ? x : y, /* INTO 12 GRADIENT DIRECTIONS. */ v = h < 4 ? y : h == 12 || h == 14 ? x : z; return ((h & 1) == 0 ? u : -u) + ((h & 2) == 0 ? v : -v); |