Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-23 09:47:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-23 11:20:20 +0300
commit6ab634ccc477fb704fce45663f170e500d5694b8 (patch)
tree53df61cccb53baa0c230352dc7ee9c97cd607428 /source/blender/blenlib/intern/noise.c
parent9d78b7edb98e769f6148d87b23709e28c5416ed0 (diff)
Cleanup: use specific names for global variables
hash & hashsizes are generic names, be more specific & define the generic names locally. Quiet undeclared variable warnings.
Diffstat (limited to 'source/blender/blenlib/intern/noise.c')
-rw-r--r--source/blender/blenlib/intern/noise.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c
index 1db3040e3db..8126bdfb3ef 100644
--- a/source/blender/blenlib/intern/noise.c
+++ b/source/blender/blenlib/intern/noise.c
@@ -148,7 +148,8 @@ static const float hashpntf[768] = {
0.114246, 0.905043, 0.713870, 0.555261, 0.951333,
};
-const unsigned char hash[512] = {
+extern const unsigned char BLI_noise_hash_uchar_512[512]; /* Quiet warning. */
+const unsigned char BLI_noise_hash_uchar_512[512] = {
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, 0x8B, 0x63,
0x89, 0x2F, 0xB8, 0xB4, 0x97, 0x83, 0xF2, 0x8F, 0x18, 0xC7, 0x51, 0x14, 0x65, 0x87, 0x48, 0x20, 0x42, 0xA8, 0x80,
@@ -177,6 +178,7 @@ const unsigned char hash[512] = {
0xE5, 0xAF, 0x53, 0x7, 0xE0, 0x29, 0xA6, 0xC5, 0xE3, 0xF5, 0xF7, 0x4A, 0x41, 0x26, 0x6A, 0x16, 0x5E, 0x52, 0x2D,
0x21, 0xAD, 0xF0, 0x91, 0xFF, 0xEA, 0x54, 0xFA, 0x66, 0x1A, 0x45, 0x39, 0xCF, 0x75, 0xA4, 0x88, 0xFB, 0x5D,
};
+#define hash BLI_noise_hash_uchar_512
static const float hashvectf[768] = {