diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-27 01:38:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-27 01:39:25 +0400 |
| commit | 8af2ed80a4bfa356ee19e74dc66cc20bb203e82e (patch) | |
| tree | 778cf9ecc7433e870d4a789de113a6d4e38bf0fb | |
| parent | c35ac8f7accf264e21f3f959ca99d05b6e04de88 (diff) | |
RNA: rename matrix_for_frame -> matrix_from_frame
| -rw-r--r-- | release/scripts/startup/bl_operators/clip.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index 72a26fd36e2..7e142cebb4f 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 16c2c5e2540..df8c68676b3 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); |