[Bf-blender-cvs] [04bfe684c9b] functions: rename

[Jacques Lucke]

Commit: 04bfe684c9b08809a91f3f1cc6adb8da069451a7
Author: Jacques Lucke
Date:   Sun Jan 19 12:06:24 2020 +0100
Branches: functions
https://developer.blender.org/rB04bfe684c9b08809a91f3f1cc6adb8da069451a7

rename

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

M	source/blender/functions/FN_multi_function.h
M	source/blender/functions/intern/multi_functions/customizable.h
M	source/blender/functions/intern/multi_functions/mixed.cc
M	source/blender/functions/intern/multi_functions/surface_hook.cc

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

diff --git a/source/blender/functions/FN_multi_function.h b/source/blender/functions/FN_multi_function.h
index 9c940fcc8bc..b6a02ee30c7 100644
--- a/source/blender/functions/FN_multi_function.h
+++ b/source/blender/functions/FN_multi_function.h
@@ -164,7 +164,7 @@ class MFSignatureBuilder {
     m_data.operation_hash = maybe_hash;
   }
 
-  void constant_operation_hash()
+  void operation_hash_per_class()
   {
     const std::type_info &type_info = typeid(*this);
     uintptr_t ptr = (uintptr_t)&type_info;
diff --git a/source/blender/functions/intern/multi_functions/customizable.h b/source/blender/functions/intern/multi_functions/customizable.h
index 25085832d31..594197a9593 100644
--- a/source/blender/functions/intern/multi_functions/customizable.h
+++ b/source/blender/functions/intern/multi_functions/customizable.h
@@ -16,7 +16,7 @@ template<typename FromT, typename ToT> class MF_Convert : public MultiFunction {
                                                      CPP_TYPE<ToT>().name());
     signature.single_input<FromT>("Input");
     signature.single_output<ToT>("Output");
-    signature.constant_operation_hash();
+    signature.operation_hash_per_class();
   }
 
   void call(IndexMask mask, MFParams params, MFContext UNUSED(context)) const override
diff --git a/source/blender/functions/intern/multi_functions/mixed.cc b/source/blender/functions/intern/multi_functions/mixed.cc
index 80ca798383d..3c88f58479f 100644
--- a/source/blender/functions/intern/multi_functions/mixed.cc
+++ b/source/blender/functions/intern/multi_functions/mixed.cc
@@ -175,7 +175,7 @@ void MF_FloatArraySum::call(IndexMask mask, MFParams params, MFContext UNUSED(co
 MF_FloatRange_Amount_Start_Step::MF_FloatRange_Amount_Start_Step()
 {
   MFSignatureBuilder signature = this->get_builder("Float Range");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
   signature.single_input<int>("Amount");
   signature.single_input<float>("Start");
   signature.single_input<float>("Step");
@@ -208,7 +208,7 @@ void MF_FloatRange_Amount_Start_Step::call(IndexMask mask,
 MF_FloatRange_Amount_Start_Stop::MF_FloatRange_Amount_Start_Stop()
 {
   MFSignatureBuilder signature = this->get_builder("Float Range");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
   signature.single_input<int>("Amount");
   signature.single_input<float>("Start");
   signature.single_input<float>("Stop");
@@ -289,7 +289,7 @@ MF_ObjectWorldLocation::MF_ObjectWorldLocation()
   signature.use_global_context<IDHandleLookup>();
   signature.single_input<ObjectIDHandle>("Object");
   signature.single_output<float3>("Location");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
 }
 
 void MF_ObjectWorldLocation::call(IndexMask mask, MFParams params, MFContext context) const
diff --git a/source/blender/functions/intern/multi_functions/surface_hook.cc b/source/blender/functions/intern/multi_functions/surface_hook.cc
index f6c549e0069..8dc0b523eec 100644
--- a/source/blender/functions/intern/multi_functions/surface_hook.cc
+++ b/source/blender/functions/intern/multi_functions/surface_hook.cc
@@ -42,7 +42,7 @@ MF_ClosestSurfaceHookOnObject::MF_ClosestSurfaceHookOnObject()
   signature.single_input<ObjectIDHandle>("Object");
   signature.single_input<float3>("Position");
   signature.single_output<SurfaceHook>("Closest Location");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
 }
 
 static BVHTreeNearest get_nearest_point(BVHTreeFromMesh *bvhtree_data, float3 point)
@@ -128,7 +128,7 @@ MF_GetPositionOnSurface::MF_GetPositionOnSurface()
   signature.use_global_context<IDHandleLookup>();
   signature.single_input<SurfaceHook>("Surface Hook");
   signature.single_output<float3>("Position");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
 }
 
 void MF_GetPositionOnSurface::call(IndexMask mask, MFParams params, MFContext context) const
@@ -194,7 +194,7 @@ MF_GetNormalOnSurface::MF_GetNormalOnSurface()
   signature.use_global_context<IDHandleLookup>();
   signature.single_input<SurfaceHook>("Surface Hook");
   signature.single_output<float3>("Normal");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
 }
 
 static float3 short_normal_to_float3(const short normal[3])
@@ -267,7 +267,7 @@ MF_GetWeightOnSurface::MF_GetWeightOnSurface()
   signature.single_input<SurfaceHook>("Surface Hook");
   signature.single_input<std::string>("Group Name");
   signature.single_output<float>("Weight");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
 }
 
 void MF_GetWeightOnSurface::call(IndexMask mask, MFParams params, MFContext context) const
@@ -347,7 +347,7 @@ MF_GetImageColorOnSurface::MF_GetImageColorOnSurface()
   signature.single_input<SurfaceHook>("Surface Hook");
   signature.single_input<ImageIDHandle>("Image");
   signature.single_output<rgba_f>("Color");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
 }
 
 static void get_colors_on_surface(IndexMask indices,
@@ -462,7 +462,7 @@ MF_SampleObjectSurface::MF_SampleObjectSurface(bool use_vertex_weights)
     signature.single_input<std::string>("Vertex Group Name");
   }
   signature.vector_output<SurfaceHook>("Surface Hooks");
-  signature.constant_operation_hash();
+  signature.operation_hash_per_class();
 }
 
 static BLI_NOINLINE void compute_triangle_areas(Mesh *mesh,