Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-05-26 22:36:25 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-05-26 22:36:25 +0400
commitec8d277c64346770b99716b3c1bbdcd07eae26f6 (patch)
treee0fc551f658e2585d0ea1c36b8d3e2c373919ef2 /source/blender/blenkernel/intern/tracking.c
parent4cf069a41d0a3c39a39237656cd7e65be1d37924 (diff)
BLI_math rename functions:
- mult_m4_m4m4 -> mul_m4_m4m4 - mult_m3_m3m4 -> mul_m3_m3m4 these temporary names were used to avoid problems when argument order was switched.
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
-rw-r--r--source/blender/blenkernel/intern/tracking.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index fdca7ff0b27..96d7d7d4fd4 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -292,7 +292,7 @@ void BKE_tracking_get_projection_matrix(MovieTracking *tracking, MovieTrackingOb
float imat[4][4];
invert_m4_m4(imat, camera->mat);
- mult_m4_m4m4(mat, winmat, imat);
+ mul_m4_m4m4(mat, winmat, imat);
}
else {
copy_m4_m4(mat, winmat);
@@ -1458,7 +1458,7 @@ static void reconstructed_camera_scale_set(MovieTrackingObject *object, float ma
float smat[4][4];
scale_m4_fl(smat, 1.0f / object->scale);
- mult_m4_m4m4(mat, mat, smat);
+ mul_m4_m4m4(mat, mat, smat);
}
}
@@ -3032,7 +3032,7 @@ static int reconstruct_retrieve_libmv_tracks(MovieReconstructContext *context, M
origin_set = true;
}
else {
- mult_m4_m4m4(mat, imat, mat);
+ mul_m4_m4m4(mat, imat, mat);
}
copy_m4_m4(reconstructed[reconstruction->camnr].mat, mat);