[Bf-blender-cvs] [0300d2a0ccc] temp-compact-node-prototype: fix after merge

[Jacques Lucke]

Commit: 0300d2a0ccc85f906b486d5394045085c1bf00e1
Author: Jacques Lucke
Date:   Thu Mar 25 16:04:49 2021 +0100
Branches: temp-compact-node-prototype
https://developer.blender.org/rB0300d2a0ccc85f906b486d5394045085c1bf00e1

fix after merge

===================================================================

M	source/blender/blenlib/BLI_hash.hh
M	source/blender/nodes/geometry/nodes/node_geo_attribute_fill.cc

===================================================================

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)