Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

RNA: rename matrix_for_frame -> matrix_from_frame

Browse Source
This commit is contained in:
Campbell Barton
2014-02-27 08:38:14 +11:00
parent c35ac8f7ac
commit 8af2ed80a4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_operators/clip.py
View 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")

4
source/blender/makesrna/intern/rna_tracking.c
View 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);