[Bf-blender-cvs] [8af2ed8] master: RNA: rename matrix_for_frame -> matrix_from_frame

[Campbell Barton]

Commit: 8af2ed80a4bfa356ee19e74dc66cc20bb203e82e
Author: Campbell Barton
Date:   Thu Feb 27 08:38:14 2014 +1100
https://developer.blender.org/rB8af2ed80a4bfa356ee19e74dc66cc20bb203e82e

RNA: rename matrix_for_frame -> matrix_from_frame

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

M	release/scripts/startup/bl_operators/clip.py
M	source/blender/makesrna/intern/rna_tracking.c

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

diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index 72a26fd..7e142ce 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -195,7 +195,7 @@ class CLIP_OT_bundles_to_mesh(Operator):
         if camera:
             reconstruction = tracking_object.reconstruction
             framenr = scene.frame_current - clip.frame_start + 1
-            reconstructed_matrix = reconstruction.cameras.matrix_for_frame(framenr)
+            reconstructed_matrix = reconstruction.cameras.matrix_from_frame(framenr)
             matrix = camera.matrix_world * reconstructed_matrix.inverted()
 
         mesh = bpy.data.meshes.new(name="Tracks")
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 16c2c5e..df8c686 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -717,7 +717,7 @@ static MovieReconstructedCamera *rna_trackingCameras_find_frame(ID *id, MovieTra
 	return BKE_tracking_camera_get_reconstructed(tracking, object, framenr);
 }
 
-static void rna_trackingCameras_matrix_for_frame(ID *id, MovieTrackingReconstruction *reconstruction, int framenr, float matrix[16])
+static void rna_trackingCameras_matrix_from_frame(ID *id, MovieTrackingReconstruction *reconstruction, int framenr, float matrix[16])
 {
 	float mat[4][4];
 
@@ -1685,7 +1685,7 @@ static void rna_def_trackingReconstructedCameras(BlenderRNA *brna)
 	parm = RNA_def_pointer(func, "camera", "MovieReconstructedCamera", "", "Camera for a given frame");
 	RNA_def_function_return(func, parm);
 
-	func = RNA_def_function(srna, "matrix_for_frame", "rna_trackingCameras_matrix_for_frame");
+	func = RNA_def_function(srna, "matrix_from_frame", "rna_trackingCameras_matrix_from_frame");
 	RNA_def_function_flag(func, FUNC_USE_SELF_ID);
 	RNA_def_function_ui_description(func, "Return interpolated camera matrix for a given frame");
 	RNA_def_int(func, "frame", 1, MINFRAME, MAXFRAME, "Frame", "Frame number to find camera for", MINFRAME, MAXFRAME);