Revision: 57039
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57039
Author: campbellbarton
Date: 2013-05-26 18:36:25 +0000 (Sun, 26 May 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/camera.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/rigidbody.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenlib/BLI_math_matrix.h
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/blenlib/intern/math_rotation.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/ControllerExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/collada/TransformWriter.cpp
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/editors/armature/armature_relations.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/meshtools.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/space_view3d/view3d_project.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/ikplugin/intern/iksolver_plugin.c
trunk/blender/source/blender/ikplugin/intern/itasc_plugin.cpp
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean_util.c
trunk/blender/source/blender/modifiers/intern/MOD_cast.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_screw.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
trunk/blender/source/blender/modifiers/intern/MOD_uvwarp.c
trunk/blender/source/blender/modifiers/intern/MOD_warp.c
trunk/blender/source/blender/modifiers/intern/MOD_wave.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/envmap.c
trunk/blender/source/blender/render/intern/source/pointdensity.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/volumetric.c
trunk/blender/source/blender/render/intern/source/zbuf.c
trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2013-05-26
18:24:13 UTC (rev 57038)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2013-05-26
18:36:25 UTC (rev 57039)
@@ -784,10 +784,10 @@
if (!is_zero_v3(group->dupli_ofs)) {
copy_m4_m4(tmat, go->ob->obmat);
sub_v3_v3v3(tmat[3], tmat[3], group->dupli_ofs);
- mult_m4_m4m4(mat, ob->obmat, tmat);
+ mul_m4_m4m4(mat, ob->obmat, tmat);
}
else {
- mult_m4_m4m4(mat, ob->obmat, go->ob->obmat);
+ mul_m4_m4m4(mat, ob->obmat, go->ob->obmat);
}
dob = new_dupli_object(lb, go->ob, mat, ob->lay,
persistent_id, level, id, OB_DUPLIGROUP, flag);
@@ -1018,7 +1018,7 @@
* when par_space_mat is NULL ob->obmat
can be used instead of ob__obmat
*/
if (par_space_mat)
- mult_m4_m4m4(vdd.obmat,
par_space_mat, ob->obmat);
+ mul_m4_m4m4(vdd.obmat,
par_space_mat, ob->obmat);
else
copy_m4_m4(vdd.obmat,
ob->obmat);
@@ -1153,7 +1153,7 @@
* when par_space_mat is NULL ob->obmat
can be used instead of ob__obmat
*/
if (par_space_mat)
- mult_m4_m4m4(ob__obmat,
par_space_mat, ob->obmat);
+ mul_m4_m4m4(ob__obmat,
par_space_mat, ob->obmat);
else
copy_m4_m4(ob__obmat,
ob->obmat);
@@ -1471,10 +1471,10 @@
if
(!is_zero_v3(part->dup_group->dupli_ofs))
sub_v3_v3v3(tmat[3], tmat[3],
part->dup_group->dupli_ofs);
/* individual particle transform */
- mult_m4_m4m4(tmat, pamat, tmat);
+ mul_m4_m4m4(tmat, pamat, tmat);
if (par_space_mat)
- mult_m4_m4m4(mat,
par_space_mat, tmat);
+ mul_m4_m4m4(mat, par_space_mat,
tmat);
else
copy_m4_m4(mat, tmat);
@@ -1514,7 +1514,7 @@
/* add scaling if requested */
if ((part->draw &
PART_DRAW_NO_SCALE_OB) == 0)
- mult_m4_m4m4(obmat, obmat,
size_mat);
+ mul_m4_m4m4(obmat, obmat,
size_mat);
}
else if (part->draw & PART_DRAW_NO_SCALE_OB) {
/* remove scaling */
@@ -1524,22 +1524,22 @@
size_to_mat4(size_mat, original_size);
invert_m4(size_mat);
- mult_m4_m4m4(obmat, obmat, size_mat);
+ mul_m4_m4m4(obmat, obmat, size_mat);
}
/* Normal particles and cached hair live in
global space so we need to
* remove the real emitter's transformation
before 2nd order duplication.
*/
if (par_space_mat && GS(id->name) != ID_GR)
- mult_m4_m4m4(mat, psys->imat, pamat);
+ mul_m4_m4m4(mat, psys->imat, pamat);
else
copy_m4_m4(mat, pamat);
- mult_m4_m4m4(tmat, mat, obmat);
+ mul_m4_m4m4(tmat, mat, obmat);
mul_mat3_m4_fl(tmat, size * scale);
if (par_space_mat)
- mult_m4_m4m4(mat, par_space_mat, tmat);
+ mul_m4_m4m4(mat, par_space_mat, tmat);
else
copy_m4_m4(mat, tmat);
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2013-05-26
18:24:13 UTC (rev 57038)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2013-05-26
18:36:25 UTC (rev 57039)
@@ -505,9 +505,9 @@
if (prev->bone->segments == 1) {
/* find the previous roll to interpolate */
if (rest)
- mult_m4_m4m4(difmat, imat, prev->bone->arm_mat);
+ mul_m4_m4m4(difmat, imat, prev->bone->arm_mat);
else
- mult_m4_m4m4(difmat, imat, prev->pose_mat);
+ mul_m4_m4m4(difmat, imat, prev->pose_mat);
copy_m3_m4(result, difmat); /* the desired rotation at
beginning of next bone */
vec_roll_to_mat3(h1, 0.0f, mat3); /* the result of
vec_roll without roll */
@@ -543,9 +543,9 @@
/* find the next roll to interpolate as well */
if (rest)
- mult_m4_m4m4(difmat, imat, next->bone->arm_mat);
+ mul_m4_m4m4(difmat, imat, next->bone->arm_mat);
else
- mult_m4_m4m4(difmat, imat, next->pose_mat);
+ mul_m4_m4m4(difmat, imat, next->pose_mat);
copy_m3_m4(result, difmat); /* the desired rotation at
beginning of next bone */
vec_roll_to_mat3(h2, 0.0f, mat3); /* the result of vec_roll
without roll */
@@ -844,7 +844,7 @@
invert_m4_m4(obinv, target->obmat);
copy_m4_m4(premat, target->obmat);
- mult_m4_m4m4(postmat, obinv, armOb->obmat);
+ mul_m4_m4m4(postmat, obinv, armOb->obmat);
invert_m4_m4(premat, postmat);
/* bone defmats are already in the channels, chan_mat */
@@ -1109,7 +1109,7 @@
invert_m4_m4(obmat, ob->obmat);
/* multiply given matrix by object's-inverse to find pose-space matrix
*/
- mult_m4_m4m4(outmat, inmat, obmat);
+ mul_m4_m4m4(outmat, inmat, obmat);
}
/* Convert World-Space Location to Pose-Space Location
@@ -1181,7 +1181,7 @@
/* Compose the rotscale matrix for this bone. */
if ((bone->flag & BONE_HINGE) && (bone->flag & BONE_NO_SCALE)) {
/* Parent rest rotation and scale. */
- mult_m4_m4m4(rotscale_mat, parbone->arm_mat, offs_bone);
+ mul_m4_m4m4(rotscale_mat, parbone->arm_mat, offs_bone);
}
else if (bone->flag & BONE_HINGE) {
/* Parent rest rotation and pose scale. */
@@ -1192,19 +1192,19 @@
size_to_mat4(tmat, tscale);
/* Applies the parent pose scale to the rest matrix. */
- mult_m4_m4m4(tmat, tmat, parbone->arm_mat);
+ mul_m4_m4m4(tmat, tmat, parbone->arm_mat);
- mult_m4_m4m4(rotscale_mat, tmat, offs_bone);
+ mul_m4_m4m4(rotscale_mat, tmat, offs_bone);
}
else if (bone->flag & BONE_NO_SCALE) {
/* Parent pose rotation and rest scale (i.e. no
scaling). */
float tmat[4][4];
copy_m4_m4(tmat, parchan->pose_mat);
normalize_m4(tmat);
- mult_m4_m4m4(rotscale_mat, tmat, offs_bone);
+ mul_m4_m4m4(rotscale_mat, tmat, offs_bone);
}
else
- mult_m4_m4m4(rotscale_mat, parchan->pose_mat,
offs_bone);
+ mul_m4_m4m4(rotscale_mat, parchan->pose_mat, offs_bone);
/* Compose the loc matrix for this bone. */
/* NOTE: That version does not modify bone's loc when
HINGE/NO_SCALE options are set. */
@@ -1224,11 +1224,11 @@
mul_m3_m3m3(bone_rotscale, tmat3, bone_rotscale);
copy_m4_m3(tmat4, bone_rotscale);
- mult_m4_m4m4(loc_mat, bone_loc, tmat4);
+ mul_m4_m4m4(loc_mat, bone_loc, tmat4);
}
/* Those flags do not affect position, use plain parent
transform space! */
else if (bone->flag & (BONE_HINGE | BONE_NO_SCALE)) {
- mult_m4_m4m4(loc_mat, parchan->pose_mat, offs_bone);
+ mul_m4_m4m4(loc_mat, parchan->pose_mat, offs_bone);
}
/* Else (i.e. default, usual case), just use the same matrix
for rotation/scaling, and location. */
else
@@ -1263,7 +1263,7 @@
invert_m4(rotscale_mat);
invert_m4(loc_mat);
- mult_m4_m4m4(outmat, rotscale_mat, inmat_);
+ mul_m4_m4m4(outmat, rotscale_mat, inmat_);
mul_v3_m4v3(outmat[3], loc_mat, inmat_[3]);
}
@@ -1277,7 +1277,7 @@
BKE_pchan_to_pose_mat(pchan, rotscale_mat, loc_mat);
- mult_m4_m4m4(outmat, rotscale_mat, inmat_);
+ mul_m4_m4m4(outmat, rotscale_mat, inmat_);
mul_v3_m4v3(outmat[3], loc_mat, inmat_[3]);
}
@@ -1349,7 +1349,7 @@
float imat[4][4];
invert_m4_m4(imat, arm_mat);
- mult_m4_m4m4(delta_mat, imat, pose_mat);
+ mul_m4_m4m4(delta_mat, imat, pose_mat);
}
/* **************** Rotation Mode Conversions ****************************** */
@@ -1522,7 +1522,7 @@
get_offset_bone_mat(bone, offs_bone);
/* Compose the matrix for this bone */
- mult_m4_m4m4(bone->arm_mat, prevbone->arm_mat, offs_bone);
+ mul_m4_m4m4(bone->arm_mat, prevbone->arm_mat, offs_bone);
}
else {
copy_m4_m3(bone->arm_mat, bone->bone_mat);
@@ -2523,7 +2523,7 @@
for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
if (pchan->bone) {
invert_m4_m4(imat, pchan->bone->arm_mat);
- mult_m4_m4m4(pchan->chan_mat, pchan->pose_mat, imat);
+ mul_m4_m4m4(pchan->chan_mat, pchan->pose_mat, imat);
}
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/camera.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/camera.c 2013-05-26
18:24:13 UTC (rev 57038)
+++ trunk/blender/source/blender/blenkernel/intern/camera.c 2013-05-26
18:36:25 UTC (rev 57039)
@@ -159,7 +159,7 @@
copy_m4_m4(obmat, ob->obmat);
normalize_m4(obmat);
invert_m4_m4(imat, obmat);
- mult_m4_m4m4(mat, imat, cam->dof_ob->obmat);
+ mul_m4_m4m4(mat, imat, cam->dof_ob->obmat);
return fabsf(mat[3][2]);
}
return cam->YF_dofdist;
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2013-05-26
18:24:13 UTC (rev 57038)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2013-05-26
18:36:25 UTC (rev 57039)
@@ -152,7 +152,7 @@
}
/* matrix in world-space */
- mult_m4_m4m4(cob->matrix, ob->obmat,
cob->pchan->pose_mat);
+ mul_m4_m4m4(cob->matrix, ob->obmat,
cob->pchan->pose_mat);
}
else
unit_m4(cob->matrix);
@@ -181,7 +181,7 @@
/* calculate delta of constraints evaluation */
invert_m4_m4(imat, cob->startmat);
- mult_m4_m4m4(delta, cob->matrix, imat);
+ mul_m4_m4m4(delta, cob->matrix, imat);
/* copy matrices back to source */
switch (cob->type) {
@@ -202,7 +202,7 @@
/* cob->ob or cob->pchan might not exist */
if (cob->ob && cob->pchan) {
/* copy new pose-matrix back to owner */
- mult_m4_m4m4(cob->pchan->pose_mat,
cob->ob->imat, cob->matrix);
+ mul_m4_m4m4(cob->pchan->pose_mat,
cob->ob->imat, cob->matrix);
/* copy inverse of delta back to owner */
invert_m4_m4(cob->pchan->constinv, delta);
@@ -239,7 +239,7 @@
{
/* world to pose */
invert_m4_m4(imat, ob->obmat);
- mult_m4_m4m4(mat, imat, mat);
+ mul_m4_m4m4(mat, imat, mat);
/* use pose-space as stepping stone for other
spaces... */
if (ELEM(to, CONSTRAINT_SPACE_LOCAL,
CONSTRAINT_SPACE_PARLOCAL)) {
@@ -252,7 +252,7 @@
{
/* pose to world */
if (to == CONSTRAINT_SPACE_WORLD) {
- mult_m4_m4m4(mat, ob->obmat, mat);
+ mul_m4_m4m4(mat, ob->obmat, mat);
}
/* pose to local */
else if (to == CONSTRAINT_SPACE_LOCAL) {
@@ -264,7 +264,7 @@
else if (to == CONSTRAINT_SPACE_PARLOCAL) {
if (pchan->bone) {
invert_m4_m4(imat,
pchan->bone->arm_mat);
- mult_m4_m4m4(mat, imat, mat);
+ mul_m4_m4m4(mat, imat, mat);
}
}
}
@@ -289,7 +289,7 @@
/* local + parent to pose */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
