[Bf-blender-cvs] [5c72773a6dd] functions: typo and minor improvement

[Jacques Lucke]

Commit: 5c72773a6dd40442d7cb568b455ff911e045568d
Author: Jacques Lucke
Date:   Mon Feb 25 17:35:06 2019 +0100
Branches: functions
https://developer.blender.org/rB5c72773a6dd40442d7cb568b455ff911e045568d

typo and minor improvement

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

M	release/scripts/startup/function_nodes/nodes/map_range.py
M	source/blender/modifiers/intern/MOD_functiondeform.c

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

diff --git a/release/scripts/startup/function_nodes/nodes/map_range.py b/release/scripts/startup/function_nodes/nodes/map_range.py
index 2a16c3691d2..f05a9fd9aa6 100644
--- a/release/scripts/startup/function_nodes/nodes/map_range.py
+++ b/release/scripts/startup/function_nodes/nodes/map_range.py
@@ -4,7 +4,7 @@ from .. base import FunctionNode
 
 class MapRangeNode(bpy.types.Node, FunctionNode):
     bl_idname = "fn_MapRangeNode"
-    bl_label = "Map Rante"
+    bl_label = "Map Range"
 
     def get_sockets(self):
         return [
diff --git a/source/blender/modifiers/intern/MOD_functiondeform.c b/source/blender/modifiers/intern/MOD_functiondeform.c
index 2ae37f7af46..0043eaed474 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform.c
+++ b/source/blender/modifiers/intern/MOD_functiondeform.c
@@ -57,9 +57,10 @@ static FnFunction get_current_function(FunctionDeformModifierData *fdmd)
 	bNodeTree *tree = (bNodeTree *)DEG_get_original_id((ID *)fdmd->function_tree);
 
 	FnType float_ty = FN_type_borrow_float();
+	FnType int32_ty = FN_type_borrow_int32();
 	FnType fvec3_ty = FN_type_borrow_fvec3();
 
-	FnType inputs[] = { fvec3_ty, float_ty, NULL };
+	FnType inputs[] = { fvec3_ty, int32_ty, float_ty, NULL };
 	FnType outputs[] = { fvec3_ty, NULL };
 
 	return FN_function_get_with_signature(tree, inputs, outputs);
@@ -81,12 +82,13 @@ static void do_deformation(
 	FnTuple fn_in = FN_tuple_for_input(fn);
 	FnTuple fn_out = FN_tuple_for_output(fn);
 
-	FN_tuple_set_float(fn_in, 1, fdmd->control1);
+	FN_tuple_set_float(fn_in, 2, fdmd->control1);
 
 	clock_t start = clock();
 
 	for (int i = 0; i < numVerts; i++) {
 		FN_tuple_set_float_vector_3(fn_in, 0, vertexCos[i]);
+		FN_tuple_set_int32(fn_in, 1, i);
 		FN_function_call(fn_call, fn_in, fn_out);
 		FN_tuple_get_float_vector_3(fn_out, 0, vertexCos[i]);
 	}
@@ -120,7 +122,7 @@ static void deformVertsEM(
 static void initData(ModifierData *md)
 {
 	FunctionDeformModifierData *fdmd = (FunctionDeformModifierData *)md;
-	fdmd->control1 = 0.0f;
+	fdmd->control1 = 1.0f;
 	fdmd->control2 = 0;
 }