[Bf-blender-cvs] [8810699abf6] geometry-nodes-deduplicate-float-math: cleanup naming

[Jacques Lucke]

Commit: 8810699abf66b88b4f01f055c35d8b6c44bec1a0
Author: Jacques Lucke
Date:   Tue Nov 24 17:15:36 2020 +0100
Branches: geometry-nodes-deduplicate-float-math
https://developer.blender.org/rB8810699abf66b88b4f01f055c35d8b6c44bec1a0

cleanup naming

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

M	source/blender/nodes/NOD_math_functions.hh
M	source/blender/nodes/shader/nodes/node_shader_math.cc

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

diff --git a/source/blender/nodes/NOD_math_functions.hh b/source/blender/nodes/NOD_math_functions.hh
index db745b5b4c8..70319c032ed 100644
--- a/source/blender/nodes/NOD_math_functions.hh
+++ b/source/blender/nodes/NOD_math_functions.hh
@@ -38,7 +38,7 @@ struct FloatMathOperationInfo {
 const FloatMathOperationInfo *get_float_math_operation_info(const int operation);
 
 template<typename OpType>
-inline bool dispatch_float_math_fl_to_fl(const int operation, OpType &&op)
+inline bool try_dispatch_float_math_fl_to_fl(const int operation, OpType &&op)
 {
   const FloatMathOperationInfo *info = get_float_math_operation_info(operation);
   if (info == nullptr) {
@@ -98,7 +98,7 @@ inline bool dispatch_float_math_fl_to_fl(const int operation, OpType &&op)
 }
 
 template<typename OpType>
-inline bool dispatch_float_math_fl_fl_to_fl(const int operation, OpType &&op)
+inline bool try_dispatch_float_math_fl_fl_to_fl(const int operation, OpType &&op)
 {
   const FloatMathOperationInfo *info = get_float_math_operation_info(operation);
   if (info == nullptr) {
@@ -142,7 +142,7 @@ inline bool dispatch_float_math_fl_fl_to_fl(const int operation, OpType &&op)
 }
 
 template<typename OpType>
-inline bool dispatch_float_math_fl_fl_fl_to_fl(const int operation, OpType &&op)
+inline bool try_dispatch_float_math_fl_fl_fl_to_fl(const int operation, OpType &&op)
 {
   const FloatMathOperationInfo *info = get_float_math_operation_info(operation);
   if (info == nullptr) {
diff --git a/source/blender/nodes/shader/nodes/node_shader_math.cc b/source/blender/nodes/shader/nodes/node_shader_math.cc
index b670dd7ce25..f54914ceba9 100644
--- a/source/blender/nodes/shader/nodes/node_shader_math.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_math.cc
@@ -76,7 +76,7 @@ static const blender::fn::MultiFunction &get_base_multi_function(
 
   const blender::fn::MultiFunction *base_fn = nullptr;
 
-  blender::nodes::dispatch_float_math_fl_to_fl(
+  blender::nodes::try_dispatch_float_math_fl_to_fl(
       mode, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
         static blender::fn::CustomMF_SI_SO<float, float> fn{info.title_case_name, function};
         base_fn = &fn;
@@ -85,7 +85,7 @@ static const blender::fn::MultiFunction &get_base_multi_function(
     return *base_fn;
   }
 
-  blender::nodes::dispatch_float_math_fl_fl_to_fl(
+  blender::nodes::try_dispatch_float_math_fl_fl_to_fl(
       mode, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
         static blender::fn::CustomMF_SI_SI_SO<float, float, float> fn{info.title_case_name,
                                                                       function};
@@ -95,7 +95,7 @@ static const blender::fn::MultiFunction &get_base_multi_function(
     return *base_fn;
   }
 
-  blender::nodes::dispatch_float_math_fl_fl_fl_to_fl(
+  blender::nodes::try_dispatch_float_math_fl_fl_fl_to_fl(
       mode, [&](auto function, const blender::nodes::FloatMathOperationInfo &info) {
         static blender::fn::CustomMF_SI_SI_SI_SO<float, float, float, float> fn{
             info.title_case_name, function};