From ec8d277c64346770b99716b3c1bbdcd07eae26f6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 26 May 2013 18:36:25 +0000 Subject: 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. --- source/blender/blenkernel/intern/anim.c | 22 +++++------ source/blender/blenkernel/intern/armature.c | 36 ++++++++--------- source/blender/blenkernel/intern/camera.c | 2 +- source/blender/blenkernel/intern/constraint.c | 56 +++++++++++++-------------- source/blender/blenkernel/intern/fcurve.c | 2 +- source/blender/blenkernel/intern/lattice.c | 4 +- source/blender/blenkernel/intern/mball.c | 6 +-- source/blender/blenkernel/intern/object.c | 10 ++--- source/blender/blenkernel/intern/particle.c | 6 +-- source/blender/blenkernel/intern/rigidbody.c | 2 +- source/blender/blenkernel/intern/tracking.c | 6 +-- 11 files changed, 76 insertions(+), 76 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index f81d6a17ced..35510fe64d5 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -784,10 +784,10 @@ static void group_duplilist(ListBase *lb, Scene *scene, Object *ob, int persiste 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 @@ static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, fl * 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 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa * 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 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p 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 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p /* 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 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Scene *scene, Object *p 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); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index ffe6a312ef8..d64ff4261dc 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -505,9 +505,9 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest) 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 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest) /* 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 @@ void armature_deform_verts(Object *armOb, Object *target, DerivedMesh *dm, float 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 @@ void BKE_armature_mat_world_to_pose(Object *ob, float inmat[4][4], float outmat[ 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 @@ void BKE_pchan_to_pose_mat(bPoseChannel *pchan, float rotscale_mat[4][4], float /* 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 @@ void BKE_pchan_to_pose_mat(bPoseChannel *pchan, float rotscale_mat[4][4], float 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 @@ void BKE_pchan_to_pose_mat(bPoseChannel *pchan, float rotscale_mat[4][4], float 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 @@ void BKE_armature_mat_pose_to_bone(bPoseChannel *pchan, float inmat[4][4], float 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 @@ void BKE_armature_mat_bone_to_pose(bPoseChannel *pchan, float inmat[4][4], float 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 @@ void BKE_armature_mat_pose_to_delta(float delta_mat[4][4], float pose_mat[4][4], 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 @@ void BKE_armature_where_is_bone(Bone *bone, Bone *prevbone) 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 @@ void BKE_pose_where_is(Scene *scene, Object *ob) 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); } } } diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index ae1fa3025b9..a47cab7f236 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -159,7 +159,7 @@ float BKE_camera_object_dof_distance(Object *ob) 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; diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 7c378a60a2b..4f0606ddb40 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -152,7 +152,7 @@ bConstraintOb *BKE_constraints_make_evalob(Scene *scene, Object *ob, void *subda } /* 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 @@ void BKE_constraints_clear_evalob(bConstraintOb *cob) /* 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 @@ void BKE_constraints_clear_evalob(bConstraintOb *cob) /* 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 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[ { /* 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 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[ { /* 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 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[ 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 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[ /* local + parent to pose */ if (pchan->bone) { copy_m4_m4(diff_mat, pchan->bone->arm_mat); - mult_m4_m4m4(mat, mat, diff_mat); + mul_m4_m4m4(mat, mat, diff_mat); } /* use pose-space as stepping stone for other spaces */ @@ -307,9 +307,9 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[ /* check if object has a parent */ if (ob->parent) { /* 'subtract' parent's effects from owner */ - mult_m4_m4m4(diff_mat, ob->parent->obmat, ob->parentinv); + mul_m4_m4m4(diff_mat, ob->parent->obmat, ob->parentinv); invert_m4_m4(imat, diff_mat); - mult_m4_m4m4(mat, imat, mat); + mul_m4_m4m4(mat, imat, mat); } else { /* Local space in this case will have to be defined as local to the owner's @@ -320,15 +320,15 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[ zero_v3(diff_mat[3]); invert_m4_m4(imat, diff_mat); - mult_m4_m4m4(mat, imat, mat); + mul_m4_m4m4(mat, imat, mat); } } else if (from == CONSTRAINT_SPACE_LOCAL && to == CONSTRAINT_SPACE_WORLD) { /* check that object has a parent - otherwise this won't work */ if (ob->parent) { /* 'add' parent's effect back to owner */ - mult_m4_m4m4(diff_mat, ob->parent->obmat, ob->parentinv); - mult_m4_m4m4(mat, diff_mat, mat); + mul_m4_m4m4(diff_mat, ob->parent->obmat, ob->parentinv); + mul_m4_m4m4(mat, diff_mat, mat); } else { /* Local space in this case will have to be defined as local to the owner's @@ -338,7 +338,7 @@ void BKE_constraint_mat_convertspace(Object *ob, bPoseChannel *pchan, float mat[ normalize_m4(diff_mat); zero_v3(diff_mat[3]); - mult_m4_m4m4(mat, diff_mat, mat); + mul_m4_m4m4(mat, diff_mat, mat); } } } @@ -534,7 +534,7 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m */ if (headtail < 0.000001f) { /* skip length interpolation if set to head */ - mult_m4_m4m4(mat, ob->obmat, pchan->pose_mat); + mul_m4_m4m4(mat, ob->obmat, pchan->pose_mat); } else { float tempmat[4][4], loc[3]; @@ -546,7 +546,7 @@ static void constraint_target_to_mat4(Object *ob, const char *substring, float m copy_m4_m4(tempmat, pchan->pose_mat); copy_v3_v3(tempmat[3], loc); - mult_m4_m4m4(mat, ob->obmat, tempmat); + mul_m4_m4m4(mat, ob->obmat, tempmat); } } else @@ -757,12 +757,12 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar /* multiply target (parent matrix) by offset (parent inverse) to get * the effect of the parent that will be exerted on the owner */ - mult_m4_m4m4(parmat, ct->matrix, data->invmat); + mul_m4_m4m4(parmat, ct->matrix, data->invmat); /* now multiply the parent matrix by the owner matrix to get the * the effect of this constraint (i.e. owner is 'parented' to parent) */ - mult_m4_m4m4(cob->matrix, parmat, cob->matrix); + mul_m4_m4m4(cob->matrix, parmat, cob->matrix); } else { float invmat[4][4], tempmat[4][4]; @@ -799,13 +799,13 @@ static void childof_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar /* multiply target (parent matrix) by offset (parent inverse) to get * the effect of the parent that will be exerted on the owner */ - mult_m4_m4m4(parmat, ct->matrix, invmat); + mul_m4_m4m4(parmat, ct->matrix, invmat); /* now multiply the parent matrix by the owner matrix to get the * the effect of this constraint (i.e. owner is 'parented' to parent) */ copy_m4_m4(tempmat, cob->matrix); - mult_m4_m4m4(cob->matrix, parmat, tempmat); + mul_m4_m4m4(cob->matrix, parmat, tempmat); /* without this, changes to scale and rotation can change location * of a parentless bone or a disconnected bone. Even though its set @@ -1222,7 +1222,7 @@ static void followpath_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstra if (data->followflag & FOLLOWPATH_RADIUS) { float tmat[4][4], rmat[4][4]; scale_m4_fl(tmat, radius); - mult_m4_m4m4(rmat, tmat, totmat); + mul_m4_m4m4(rmat, tmat, totmat); copy_m4_m4(totmat, rmat); } @@ -2142,7 +2142,7 @@ static void actcon_evaluate(bConstraint *UNUSED(con), bConstraintOb *cob, ListBa * function has already taken care of everything else. */ copy_m4_m4(temp, cob->matrix); - mult_m4_m4m4(cob->matrix, temp, ct->matrix); + mul_m4_m4m4(cob->matrix, temp, ct->matrix); } } @@ -2828,7 +2828,7 @@ static void minmax_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ if (data->flag & MINMAX_USEROT) { /* take rotation of target into account by doing the transaction in target's localspace */ invert_m4_m4(imat, tarmat); - mult_m4_m4m4(tmat, imat, obmat); + mul_m4_m4m4(tmat, imat, obmat); copy_m4_m4(obmat, tmat); unit_m4(tarmat); } @@ -2881,7 +2881,7 @@ static void minmax_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *targ } if (data->flag & MINMAX_USEROT) { /* get out of localspace */ - mult_m4_m4m4(tmat, ct->matrix, obmat); + mul_m4_m4m4(tmat, ct->matrix, obmat); copy_m4_m4(cob->matrix, tmat); } else { @@ -3878,7 +3878,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase else { BKE_tracking_get_camera_object_matrix(cob->scene, camob, mat); - mult_m4_m4m4(cob->matrix, obmat, mat); + mul_m4_m4m4(cob->matrix, obmat, mat); translate_m4(cob->matrix, track->bundle_pos[0], track->bundle_pos[1], track->bundle_pos[2]); } } @@ -3964,7 +3964,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase copy_m4_m4(rmat, camob->obmat); zero_v3(rmat[3]); - mult_m4_m4m4(cob->matrix, cob->matrix, rmat); + mul_m4_m4m4(cob->matrix, cob->matrix, rmat); copy_v3_v3(cob->matrix[3], disp); } @@ -3985,7 +3985,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase /* apply camera rotation so Z-axis would be co-linear */ copy_m4_m4(rmat, camob->obmat); zero_v3(rmat[3]); - mult_m4_m4m4(cob->matrix, cob->matrix, rmat); + mul_m4_m4m4(cob->matrix, cob->matrix, rmat); copy_v3_v3(cob->matrix[3], disp); } @@ -4076,7 +4076,7 @@ static void camerasolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase copy_m4_m4(obmat, cob->matrix); - mult_m4_m4m4(cob->matrix, obmat, mat); + mul_m4_m4m4(cob->matrix, obmat, mat); } } @@ -4142,7 +4142,7 @@ static void objectsolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, framenr, mat); invert_m4_m4(camimat, cammat); - mult_m4_m4m4(parmat, cammat, data->invmat); + mul_m4_m4m4(parmat, cammat, data->invmat); copy_m4_m4(cammat, camob->obmat); copy_m4_m4(obmat, cob->matrix); diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 8d3d503a33c..f763670baef 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -1375,7 +1375,7 @@ static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar) } else { /* worldspace matrix */ - mult_m4_m4m4(mat, ob->obmat, pchan->pose_mat); + mul_m4_m4m4(mat, ob->obmat, pchan->pose_mat); } } else { diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index c881209b109..dac6ba4a0f3 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -312,7 +312,7 @@ void init_latt_deform(Object *oblatt, Object *ob) else { /* in deformspace, calc matrix */ invert_m4_m4(imat, oblatt->obmat); - mult_m4_m4m4(lt->latmat, imat, ob->obmat); + mul_m4_m4m4(lt->latmat, imat, ob->obmat); /* back: put in deform array */ invert_m4_m4(imat, lt->latmat); @@ -473,7 +473,7 @@ typedef struct { static void init_curve_deform(Object *par, Object *ob, CurveDeform *cd) { invert_m4_m4(ob->imat, ob->obmat); - mult_m4_m4m4(cd->objectspace, ob->imat, par->obmat); + mul_m4_m4m4(cd->objectspace, ob->imat, par->obmat); invert_m4_m4(cd->curvespace, cd->objectspace); copy_m3_m4(cd->objectspace3, cd->objectspace); cd->no_rot_axis = 0; diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 19c98eb5139..43819e1e80e 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -1760,7 +1760,7 @@ static float init_meta(Scene *scene, Object *ob) /* return totsize */ temp2[3][1] = ml->y; temp2[3][2] = ml->z; - mult_m4_m4m4(temp1, temp2, temp3); + mul_m4_m4m4(temp1, temp2, temp3); /* make a copy because of duplicates */ G_mb.mainb[a] = new_pgn_element(sizeof(MetaElem)); @@ -1772,9 +1772,9 @@ static float init_meta(Scene *scene, Object *ob) /* return totsize */ /* mat is the matrix to transform from mball into the basis-mball */ invert_m4_m4(obinv, obmat); - mult_m4_m4m4(temp2, obinv, bob->obmat); + mul_m4_m4m4(temp2, obinv, bob->obmat); /* MetaBall transformation */ - mult_m4_m4m4(mat, temp2, temp1); + mul_m4_m4m4(mat, temp2, temp1); invert_m4_m4(imat, mat); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 3779aa8cd88..9a08254157e 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1444,7 +1444,7 @@ void BKE_object_make_proxy(Object *ob, Object *target, Object *gob) * this is closer to making a copy of the object - in-place. */ if (gob) { ob->rotmode = target->rotmode; - mult_m4_m4m4(ob->obmat, gob->obmat, target->obmat); + mul_m4_m4m4(ob->obmat, gob->obmat, target->obmat); if (gob->dup_group) { /* should always be true */ float tvec[3]; copy_v3_v3(tvec, gob->dup_group->dupli_ofs); @@ -1673,9 +1673,9 @@ void BKE_object_apply_mat4(Object *ob, float mat[4][4], const bool use_compat, c if (use_parent && ob->parent) { float rmat[4][4], diff_mat[4][4], imat[4][4]; - mult_m4_m4m4(diff_mat, ob->parent->obmat, ob->parentinv); + mul_m4_m4m4(diff_mat, ob->parent->obmat, ob->parentinv); invert_m4_m4(imat, diff_mat); - mult_m4_m4m4(rmat, imat, mat); /* get the parent relative matrix */ + mul_m4_m4m4(rmat, imat, mat); /* get the parent relative matrix */ BKE_object_apply_mat4(ob, rmat, use_compat, FALSE); /* same as below, use rmat rather than mat */ @@ -1799,7 +1799,7 @@ static void ob_parcurve(Scene *scene, Object *ob, Object *par, float mat[4][4]) if (cu->flag & CU_PATH_RADIUS) { float tmat[4][4], rmat[4][4]; scale_m4_fl(tmat, radius); - mult_m4_m4m4(rmat, tmat, mat); + mul_m4_m4m4(rmat, tmat, mat); copy_m4_m4(mat, rmat); } @@ -2620,7 +2620,7 @@ void BKE_object_handle_update_ex(Scene *scene, Object *ob, if (ob->proxy_from->proxy_group) { /* transform proxy into group space */ Object *obg = ob->proxy_from->proxy_group; invert_m4_m4(obg->imat, obg->obmat); - mult_m4_m4m4(ob->obmat, obg->imat, ob->proxy_from->obmat); + mul_m4_m4m4(ob->obmat, obg->imat, ob->proxy_from->obmat); if (obg->dup_group) { /* should always be true */ add_v3_v3(ob->obmat[3], obg->dup_group->dupli_ofs); } diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 4e78ab52499..a95afe14a48 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -716,8 +716,8 @@ void psys_render_set(Object *ob, ParticleSystem *psys, float viewmat[4][4], floa psys->childcachebufs.first = psys->childcachebufs.last = NULL; copy_m4_m4(data->winmat, winmat); - mult_m4_m4m4(data->viewmat, viewmat, ob->obmat); - mult_m4_m4m4(data->mat, winmat, data->viewmat); + mul_m4_m4m4(data->viewmat, viewmat, ob->obmat); + mul_m4_m4m4(data->mat, winmat, data->viewmat); data->winx = winx; data->winy = winy; @@ -3467,7 +3467,7 @@ void psys_mat_hair_to_global(Object *ob, DerivedMesh *dm, short from, ParticleDa psys_mat_hair_to_object(ob, dm, from, pa, facemat); - mult_m4_m4m4(hairmat, ob->obmat, facemat); + mul_m4_m4m4(hairmat, ob->obmat, facemat); } /************************************************/ diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c index b1563363e2a..9ddf0cd2d68 100644 --- a/source/blender/blenkernel/intern/rigidbody.c +++ b/source/blender/blenkernel/intern/rigidbody.c @@ -1204,7 +1204,7 @@ void BKE_rigidbody_sync_transforms(RigidBodyWorld *rbw, Object *ob, float ctime) mat4_to_size(size, ob->obmat); size_to_mat4(size_mat, size); - mult_m4_m4m4(mat, mat, size_mat); + mul_m4_m4m4(mat, mat, size_mat); copy_m4_m4(ob->obmat, mat); } 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); -- cgit v1.2.3