[Bf-blender-cvs] [8085925bc67] functions: naming cleanup

[Jacques Lucke]

Commit: 8085925bc67c7cb3430dcba8fc9576ce7894fb64
Author: Jacques Lucke
Date:   Fri Mar 1 16:31:41 2019 +0100
Branches: functions
https://developer.blender.org/rB8085925bc67c7cb3430dcba8fc9576ce7894fb64

naming cleanup

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

M	source/blender/functions/CMakeLists.txt
M	source/blender/functions/FN_tuple_call.hpp
R093	source/blender/functions/backends/tuple_call/fgraph_to_tuple_call.cpp	source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
R062	source/blender/functions/backends/tuple_call/fgraph_to_tuple_call.hpp	source/blender/functions/backends/tuple_call/fgraph_tuple_call.hpp
M	source/blender/functions/frontends/data_flow_nodes/function_generation.cpp

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

diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index d3b2c28053e..266326d9256 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -34,8 +34,8 @@ set(SRC
 	backends/tuple_call/cpp_types.cpp
 	backends/tuple_call/tuple_call.hpp
 	backends/tuple_call/tuple_call.cpp
-	backends/tuple_call/fgraph_to_tuple_call.hpp
-	backends/tuple_call/fgraph_to_tuple_call.cpp
+	backends/tuple_call/fgraph_tuple_call.hpp
+	backends/tuple_call/fgraph_tuple_call.cpp
 	backends/tuple_call/tuple.hpp
 
 	backends/dependencies/dependencies.hpp
diff --git a/source/blender/functions/FN_tuple_call.hpp b/source/blender/functions/FN_tuple_call.hpp
index d1d68f99636..ee3da8c3565 100644
--- a/source/blender/functions/FN_tuple_call.hpp
+++ b/source/blender/functions/FN_tuple_call.hpp
@@ -3,4 +3,4 @@
 #include "backends/tuple_call/cpp_types.hpp"
 #include "backends/tuple_call/tuple.hpp"
 #include "backends/tuple_call/tuple_call.hpp"
-#include "backends/tuple_call/fgraph_to_tuple_call.hpp"
\ No newline at end of file
+#include "backends/tuple_call/fgraph_tuple_call.hpp"
\ No newline at end of file
diff --git a/source/blender/functions/backends/tuple_call/fgraph_to_tuple_call.cpp b/source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
similarity index 93%
rename from source/blender/functions/backends/tuple_call/fgraph_to_tuple_call.cpp
rename to source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
index ca90ad62d86..f61f484a35c 100644
--- a/source/blender/functions/backends/tuple_call/fgraph_to_tuple_call.cpp
+++ b/source/blender/functions/backends/tuple_call/fgraph_tuple_call.cpp
@@ -1,4 +1,4 @@
-#include "fgraph_to_tuple_call.hpp"
+#include "fgraph_tuple_call.hpp"
 
 namespace FN {
 
@@ -49,7 +49,7 @@ namespace FN {
 		}
 	};
 
-	TupleCallBody *fgraph_to_tuple_call(
+	TupleCallBody *fgraph_tuple_call(
 		const FunctionGraph &function_graph)
 	{
 		return new ExecuteGraph(function_graph);
diff --git a/source/blender/functions/backends/tuple_call/fgraph_to_tuple_call.hpp b/source/blender/functions/backends/tuple_call/fgraph_tuple_call.hpp
similarity index 62%
rename from source/blender/functions/backends/tuple_call/fgraph_to_tuple_call.hpp
rename to source/blender/functions/backends/tuple_call/fgraph_tuple_call.hpp
index 7cca739e626..6441583ec86 100644
--- a/source/blender/functions/backends/tuple_call/fgraph_to_tuple_call.hpp
+++ b/source/blender/functions/backends/tuple_call/fgraph_tuple_call.hpp
@@ -4,7 +4,7 @@
 
 namespace FN {
 
-	TupleCallBody *fgraph_to_tuple_call(
+	TupleCallBody *fgraph_tuple_call(
 		const FunctionGraph &function_graph);
 
 } /* namespace FN */
\ No newline at end of file
diff --git a/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp b/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
index 883deccd6cf..461e468616a 100644
--- a/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/function_generation.cpp
@@ -17,7 +17,7 @@ namespace FN { namespace DataFlowNodes {
 		FunctionGraph fgraph = fgraph_.value();
 
 		auto fn = SharedFunction::New(btree->id.name, fgraph.signature());
-		fn->add_body(fgraph_to_tuple_call(fgraph));
+		fn->add_body(fgraph_tuple_call(fgraph));
 		fn->add_body(fgraph_dependencies(fgraph));
 		return fn;
 	}