diff options
| -rw-r--r-- | source/blender/blenlib/BLI_hash.hh | 9 | ||||
| -rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/blenlib/BLI_hash.hh b/source/blender/blenlib/BLI_hash.hh index fd8138e6305..ac0c2e4260d 100644 --- a/source/blender/blenlib/BLI_hash.hh +++ b/source/blender/blenlib/BLI_hash.hh @@ -246,13 +246,4 @@ template<typename T1, typename T2> struct DefaultHash<std::pair<T1, T2>> { } }; -template<typename T1, typename T2, typename T3> -uint64_t default_hash_3(const T1 &v1, const T2 &v2, const T3 &v3) -{ - const uint64_t h1 = DefaultHash<T1>{}(v1); - const uint64_t h2 = DefaultHash<T2>{}(v2); - const uint64_t h3 = DefaultHash<T3>{}(v3); - return (h1 * 73856093) ^ (h2 * 19349663) ^ (h3 * 83492791); -} - } // namespace blender diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc index 3b4f10da765..cbe44c54fb4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc @@ -82,7 +82,7 @@ struct SocketMenuInfo { uint64_t hash() const { - return default_hash_3(ntree, node, socket); + return get_default_hash_3(ntree, node, socket); } friend bool operator==(const SocketMenuInfo &a, const SocketMenuInfo &b) |