RNA: rename matrix_for_frame -> matrix_from_frame
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Feb 2014 21:38:14 +0000 (08:38 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Feb 2014 21:39:25 +0000 (08:39 +1100)
release/scripts/startup/bl_operators/clip.py
source/blender/makesrna/intern/rna_tracking.c

index 72a26fd36e2b07d6383b1d1764c3b1cfa71f905e..7e142cebb4f3b506024b1e8ffaa9005dc151682d 100644 (file)
@@ -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")
index 16c2c5e2540cb087f5875a76aa81b7dc59620505..df8c68676b3ca24eb4f82c285c7863459393a025 100644 (file)
@@ -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);