diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 03:45:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-23 09:40:10 +0300 |
commit | bc8504cb4c93eb3aac22222f62966c13560a2bf6 (patch) | |
tree | 1e3bcf5bf5a02a9722ef049dfc506f5b4c06d72e /source/blender/blenlib/intern/noise.c | |
parent | 676d790d29ead413a9619aa94005c5248d274cb2 (diff) |
Cleanup: shadowing (blenlib, gpu, imbuf)
Diffstat (limited to 'source/blender/blenlib/intern/noise.c')
-rw-r--r-- | source/blender/blenlib/intern/noise.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index 4b2ad834d75..c3a0c44d7c5 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -452,7 +452,7 @@ float BLI_turbulence1(float noisesize, float x, float y, float z, int nr) /* ********************* FROM PERLIN HIMSELF: ******************** */ -static const char p[512 + 2] = { +static const char g_perlin_data_ub[512 + 2] = { 0xA2, 0xA0, 0x19, 0x3B, 0xF8, 0xEB, 0xAA, 0xEE, 0xF3, 0x1C, 0x67, 0x28, 0x1D, 0xED, 0x0, 0xDE, 0x95, 0x2E, 0xDC, 0x3F, 0x3A, 0x82, 0x35, 0x4D, 0x6C, 0xBA, 0x36, 0xD0, 0xF6, 0xC, 0x79, 0x32, 0xD1, 0x59, 0xF4, 0x8, @@ -499,7 +499,7 @@ static const char p[512 + 2] = { }; -static const float g[512 + 2][3] = { +static const float g_perlin_data_v3[512 + 2][3] = { {0.33783, 0.715698, -0.611206}, {-0.944031, -0.326599, -0.045624}, {-0.101074, -0.416443, -0.903503}, @@ -1028,6 +1028,8 @@ static const float g[512 + 2][3] = { static float noise3_perlin(float vec[3]) { + const char *p = g_perlin_data_ub; + const float (*g)[3] = g_perlin_data_v3; int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11; float rx0, rx1, ry0, ry1, rz0, rz1, sx, sy, sz, a, b, c, d, t, u, v; const float *q; |