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:
authorDalai Felinto <dfelinto@gmail.com>2017-04-18 17:06:01 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-04-18 17:29:42 +0300
commitbc6a75b405c4e0b1e85c9c6ec6646fd2d3f67686 (patch)
tree1dd28ef80fa66fc0703ead335e2801fa10aa6ec4 /source/blender/blenlib
parentb8fd6f94a06c65f6bfe90d9cc45ae1406cd0dc27 (diff)
Revert "Object Info node support for GLSL mode and the internal render"
This reverts commit 76425feed8644a8fe1c0e52ef3f77b95012ba44e. ** Note ** This was supposed to be a merge, but it was rebased.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_hash.h66
1 files changed, 0 insertions, 66 deletions
diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h
deleted file mode 100644
index 551143f5d72..00000000000
--- a/source/blender/blenlib/BLI_hash.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BLI_HASH_H__
-#define __BLI_HASH_H__
-
-/** \file BLI_hash.h
- * \ingroup bli
- */
-
-static inline unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky)
-{
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-
- unsigned int a, b, c;
-
- a = b = c = 0xdeadbeef + (2 << 2) + 13;
- a += kx;
- b += ky;
-
- c ^= b; c -= rot(b,14);
- a ^= c; a -= rot(c,11);
- b ^= a; b -= rot(a,25);
- c ^= b; c -= rot(b,16);
- a ^= c; a -= rot(c,4);
- b ^= a; b -= rot(a,14);
- c ^= b; c -= rot(b,24);
-
- return c;
-
-#undef rot
-}
-
-static inline unsigned int BLI_hash_string(const char *str)
-{
- unsigned int i = 0, c;
-
- while((c = *str++))
- i = i * 37 + c;
-
- return i;
-}
-
-static inline unsigned int BLI_hash_int(unsigned int k)
-{
- return BLI_hash_int_2d(k, 0);
-}
-
-#endif // __BLI_HASH_H__