[Bf-blender-cvs] [5784e17ff74] functions: renaming

[Jacques Lucke]

Commit: 5784e17ff7418895630efed7d8bdd713d6ae7a9d
Author: Jacques Lucke
Date:   Thu Jan 31 16:36:02 2019 +0100
Branches: functions
https://developer.blender.org/rB5784e17ff7418895630efed7d8bdd713d6ae7a9d

renaming

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

M	source/blender/functions/FN_functions.h
M	source/blender/functions/c_wrapper.cpp
M	source/blender/modifiers/intern/MOD_functiondeform.c

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

diff --git a/source/blender/functions/FN_functions.h b/source/blender/functions/FN_functions.h
index fd244e4e9ee..ec6191f6645 100644
--- a/source/blender/functions/FN_functions.h
+++ b/source/blender/functions/FN_functions.h
@@ -10,10 +10,10 @@ extern "C" {
 typedef struct OpaqueFnFunction *FnFunction;
 typedef struct OpaqueFnType *FnTypeRef;
 typedef struct OpaqueFnTuple *FnTuple;
-typedef struct OpaqueFnCallTuple *FnCallTuple;
+typedef struct OpaqueFnCallable *FnCallable;
 
-FnCallTuple FN_function_get_tuple_call(FnFunction fn);
-void FN_function_call_tuple(FnCallTuple call, FnTuple fn_in, FnTuple fn_out);
+FnCallable FN_function_get_callable(FnFunction fn);
+void FN_function_call(FnCallable call, FnTuple fn_in, FnTuple fn_out);
 
 FnTuple FN_tuple_for_input(FnFunction fn);
 FnTuple FN_tuple_for_output(FnFunction fn);
diff --git a/source/blender/functions/c_wrapper.cpp b/source/blender/functions/c_wrapper.cpp
index 2e7ff0fc403..dd7e3ea45f4 100644
--- a/source/blender/functions/c_wrapper.cpp
+++ b/source/blender/functions/c_wrapper.cpp
@@ -9,14 +9,14 @@
 
 WRAPPERS(const FN::Function *, FnFunction);
 WRAPPERS(FN::Tuple *, FnTuple);
-WRAPPERS(const FN::TupleCallBody *, FnCallTuple);
+WRAPPERS(const FN::TupleCallBody *, FnCallable);
 
-void FN_function_call_tuple(FnCallTuple fn_call, FnTuple fn_in, FnTuple fn_out)
+void FN_function_call(FnCallable fn_call, FnTuple fn_in, FnTuple fn_out)
 {
 	unwrap(fn_call)->call(*unwrap(fn_in), *unwrap(fn_out));
 }
 
-FnCallTuple FN_function_get_tuple_call(FnFunction fn)
+FnCallable FN_function_get_callable(FnFunction fn)
 {
 	return wrap(unwrap(fn)->body<FN::TupleCallBody>());
 }
diff --git a/source/blender/modifiers/intern/MOD_functiondeform.c b/source/blender/modifiers/intern/MOD_functiondeform.c
index 82f7c04ceb3..d05162a96e1 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform.c
+++ b/source/blender/modifiers/intern/MOD_functiondeform.c
@@ -54,7 +54,7 @@ static void do_deformation(
         int numVerts)
 {
 	FnFunction fn = FN_get_deform_function(fdmd->control2);
-	FnCallTuple fn_call = FN_function_get_tuple_call(fn);
+	FnCallable fn_call = FN_function_get_callable(fn);
 	FnTuple fn_in = FN_tuple_for_input(fn);
 	FnTuple fn_out = FN_tuple_for_output(fn);
 
@@ -64,7 +64,7 @@ static void do_deformation(
 
 	for (int i = 0; i < numVerts; i++) {
 		FN_tuple_set_float_vector_3(fn_in, 0, vertexCos[i]);
-		FN_function_call_tuple(fn_call, fn_in, fn_out);
+		FN_function_call(fn_call, fn_in, fn_out);
 		FN_tuple_get_float_vector_3(fn_out, 0, vertexCos[i]);
 	}