diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
| commit | ec8d277c64346770b99716b3c1bbdcd07eae26f6 (patch) | |
| tree | e0fc551f658e2585d0ea1c36b8d3e2c373919ef2 /source | |
| parent | 4cf069a41d0a3c39a39237656cd7e65be1d37924 (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')
72 files changed, 254 insertions, 256 deletions
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); diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h index e408b223923..723122d7814 100644 --- a/source/blender/blenlib/BLI_math_matrix.h +++ b/source/blender/blenlib/BLI_math_matrix.h @@ -74,10 +74,8 @@ void sub_m4_m4m4(float R[4][4], float A[4][4], float B[4][4]); void mul_m3_m3m3(float R[3][3], float A[3][3], float B[3][3]); void mul_m4_m3m4(float R[4][4], float A[3][3], float B[4][4]); void mul_m4_m4m3(float R[4][4], float A[4][4], float B[3][3]); -/* note: the A,B arguments are reversed compared to previous mul_m4_m4m4 - * function, for consistency with above functions & math notation. */ -void mult_m4_m4m4(float R[4][4], float A[4][4], float B[4][4]); -void mult_m3_m3m4(float R[3][3], float A[4][4], float B[3][3]); +void mul_m4_m4m4(float R[4][4], float A[4][4], float B[4][4]); +void mul_m3_m3m4(float R[3][3], float A[4][4], float B[3][3]); void mul_serie_m3(float R[3][3], float M1[3][3], float M2[3][3], float M3[3][3], float M4[3][3], diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index 9a8eb17da63..298abfa8c5e 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -142,7 +142,7 @@ void swap_m4m4(float m1[4][4], float m2[4][4]) /******************************** Arithmetic *********************************/ -void mult_m4_m4m4(float m1[4][4], float m3_[4][4], float m2_[4][4]) +void mul_m4_m4m4(float m1[4][4], float m3_[4][4], float m2_[4][4]) { float m2[4][4], m3[4][4]; @@ -215,7 +215,7 @@ void mul_m4_m4m3(float m1[4][4], float m3_[4][4], float m2_[3][3]) } /* m1 = m2 * m3, ignore the elements on the 4th row/column of m3 */ -void mult_m3_m3m4(float m1[3][3], float m3_[4][4], float m2_[3][3]) +void mul_m3_m3m4(float m1[3][3], float m3_[4][4], float m2_[3][3]) { float m2[3][3], m3[4][4]; @@ -298,19 +298,19 @@ void mul_serie_m4(float answ[4][4], float m1[4][4], if (m1 == NULL || m2 == NULL) return; - mult_m4_m4m4(answ, m1, m2); + mul_m4_m4m4(answ, m1, m2); if (m3) { - mult_m4_m4m4(temp, answ, m3); + mul_m4_m4m4(temp, answ, m3); if (m4) { - mult_m4_m4m4(answ, temp, m4); + mul_m4_m4m4(answ, temp, m4); if (m5) { - mult_m4_m4m4(temp, answ, m5); + mul_m4_m4m4(temp, answ, m5); if (m6) { - mult_m4_m4m4(answ, temp, m6); + mul_m4_m4m4(answ, temp, m6); if (m7) { - mult_m4_m4m4(temp, answ, m7); + mul_m4_m4m4(temp, answ, m7); if (m8) { - mult_m4_m4m4(answ, temp, m8); + mul_m4_m4m4(answ, temp, m8); } else copy_m4_m4(answ, temp); } diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index 93954499d53..44d54365e6a 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -1465,7 +1465,7 @@ void mat4_to_dquat(DualQuat *dq, float basemat[4][4], float mat[4][4]) /* split scaling and rotation, there is probably a faster way to do * this, it's done like this now to correctly get negative scaling */ - mult_m4_m4m4(baseRS, mat, basemat); + mul_m4_m4m4(baseRS, mat, basemat); mat4_to_size(scale, baseRS); dscale[0] = scale[0] - 1.0f; @@ -1485,10 +1485,10 @@ void mat4_to_dquat(DualQuat *dq, float basemat[4][4], float mat[4][4]) copy_v3_v3(baseR[3], baseRS[3]); invert_m4_m4(baseinv, basemat); - mult_m4_m4m4(R, baseR, baseinv); + mul_m4_m4m4(R, baseR, baseinv); invert_m4_m4(baseRinv, baseR); - mult_m4_m4m4(S, baseRinv, baseRS); + mul_m4_m4m4(S, baseRinv, baseRS); /* set scaling part */ mul_serie_m4(dq->scale, basemat, S, baseinv, NULL, NULL, NULL, NULL, NULL); diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 3cd0efe6978..19a49c4344d 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -958,7 +958,7 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj // compute bone local mat if (bone->parent) { invert_m4_m4(ipar, parchan->pose_mat); - mult_m4_m4m4(mat, ipar, pchan->pose_mat); + mul_m4_m4m4(mat, ipar, pchan->pose_mat); } else copy_m4_m4(mat, pchan->pose_mat); @@ -972,13 +972,13 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj temp[3][0] = temp[3][1] = temp[3][2] = 0.0f; invert_m4(temp); - mult_m4_m4m4(mat, mat, temp); + mul_m4_m4m4(mat, mat, temp); if (bone->parent) { copy_m4_m4(temp, bone->parent->arm_mat); temp[3][0] = temp[3][1] = temp[3][2] = 0.0f; - mult_m4_m4m4(mat, temp, mat); + mul_m4_m4m4(mat, temp, mat); } } @@ -1497,7 +1497,7 @@ void AnimationExporter::sample_animation(float *v, std::vector<float> &frames, i // compute bone local mat if (bone->parent) { invert_m4_m4(ipar, parchan->pose_mat); - mult_m4_m4m4(mat, ipar, pchan->pose_mat); + mul_m4_m4m4(mat, ipar, pchan->pose_mat); } else copy_m4_m4(mat, pchan->pose_mat); diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index e36a9873574..643b2cdc2b0 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -788,7 +788,7 @@ void AnimationImporter::apply_matrix_curves(Object *ob, std::vector<FCurve *>& a // calc M calc_joint_parent_mat_rest(par, NULL, root, node); - mult_m4_m4m4(temp, par, matfra); + mul_m4_m4m4(temp, par, matfra); // evaluate_joint_world_transform_at_frame(temp, NULL, node, fra); @@ -1194,7 +1194,7 @@ void AnimationImporter::add_bone_animation_sampled(Object *ob, std::vector<FCurv // calc M calc_joint_parent_mat_rest(par, NULL, root, node); - mult_m4_m4m4(temp, par, matfra); + mul_m4_m4m4(temp, par, matfra); // evaluate_joint_world_transform_at_frame(temp, NULL, node, fra); @@ -1529,7 +1529,7 @@ Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node, // calc M calc_joint_parent_mat_rest(par, NULL, root, node); - mult_m4_m4m4(temp, par, matfra); + mul_m4_m4m4(temp, par, matfra); // evaluate_joint_world_transform_at_frame(temp, NULL, node, fra); @@ -1683,7 +1683,7 @@ void AnimationImporter::evaluate_transform_at_frame(float mat[4][4], COLLADAFW:: float temp[4][4]; copy_m4_m4(temp, mat); - mult_m4_m4m4(mat, temp, m); + mul_m4_m4m4(mat, temp, m); } } @@ -1847,7 +1847,7 @@ void AnimationImporter::get_joint_rest_mat(float mat[4][4], COLLADAFW::Node *roo calc_joint_parent_mat_rest(par, NULL, root, node); get_node_mat(m, node, NULL, NULL); - mult_m4_m4m4(mat, par, m); + mul_m4_m4m4(mat, par, m); } } @@ -1866,7 +1866,7 @@ bool AnimationImporter::calc_joint_parent_mat_rest(float mat[4][4], float par[4] if (par) { float temp[4][4]; get_node_mat(temp, node, NULL, NULL); - mult_m4_m4m4(m, par, temp); + mul_m4_m4m4(m, par, temp); } else { get_node_mat(m, node, NULL, NULL); @@ -1904,7 +1904,7 @@ Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::No float temp[4][4], ipar[4][4]; invert_m4_m4(ipar, par_job->obmat); copy_m4_m4(temp, mat); - mult_m4_m4m4(mat, ipar, temp); + mul_m4_m4m4(mat, ipar, temp); } TransformBase::decompose(mat, job->loc, NULL, job->quat, job->size); @@ -1937,7 +1937,7 @@ bool AnimationImporter::evaluate_joint_world_transform_at_frame(float mat[4][4], if (par) { float temp[4][4]; evaluate_transform_at_frame(temp, node, node == end ? fra : 0.0f); - mult_m4_m4m4(m, par, temp); + mul_m4_m4m4(m, par, temp); } else { evaluate_transform_at_frame(m, node, node == end ? fra : 0.0f); diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp index 2d3dc979416..438421ccd14 100644 --- a/source/blender/collada/ArmatureExporter.cpp +++ b/source/blender/collada/ArmatureExporter.cpp @@ -204,7 +204,7 @@ void ArmatureExporter::add_bone_node(Bone *bone, Object *ob_arm, Scene *sce, copy_m4_m4(temp, bone->arm_mat); temp[3][0] = temp[3][1] = temp[3][2] = 0.0f; - mult_m4_m4m4((*i)->parentinv, temp, (*i)->parentinv); + mul_m4_m4m4((*i)->parentinv, temp, (*i)->parentinv); } se->writeNodes(*i, sce); @@ -257,11 +257,11 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW: /*bPoseChannel *parchan = BKE_pose_channel_find_name(ob_arm->pose, bone->parent->name); float invpar[4][4]; invert_m4_m4(invpar, parchan->pose_mat); - mult_m4_m4m4(mat, invpar, pchan->pose_mat);*/ + mul_m4_m4m4(mat, invpar, pchan->pose_mat);*/ float invpar[4][4]; invert_m4_m4(invpar, bone->parent->arm_mat); - mult_m4_m4m4(mat, invpar, bone->arm_mat); + mul_m4_m4m4(mat, invpar, bone->arm_mat); } else { @@ -281,13 +281,13 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW: temp[3][0] = temp[3][1] = temp[3][2] = 0.0f; invert_m4(temp); - mult_m4_m4m4(mat, mat, temp); + mul_m4_m4m4(mat, mat, temp); if (bone->parent) { copy_m4_m4(temp, bone->parent->arm_mat); temp[3][0] = temp[3][1] = temp[3][2] = 0.0f; - mult_m4_m4m4(mat, temp, mat); + mul_m4_m4m4(mat, temp, mat); } } diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 901dd85a482..8791d94f44a 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -109,7 +109,7 @@ void ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBo // get world-space if (parent) { - mult_m4_m4m4(mat, parent_mat, obmat); + mul_m4_m4m4(mat, parent_mat, obmat); } else { copy_m4_m4(mat, obmat); @@ -486,10 +486,10 @@ void ArmatureImporter::set_pose(Object *ob_arm, COLLADAFW::Node *root_node, con // get world-space if (parentname) { - mult_m4_m4m4(mat, parent_mat, obmat); + mul_m4_m4m4(mat, parent_mat, obmat); bPoseChannel *parchan = BKE_pose_channel_find_name(ob_arm->pose, parentname); - mult_m4_m4m4(pchan->pose_mat, parchan->pose_mat, mat); + mul_m4_m4m4(pchan->pose_mat, parchan->pose_mat, mat); } else { @@ -497,7 +497,7 @@ void ArmatureImporter::set_pose(Object *ob_arm, COLLADAFW::Node *root_node, con copy_m4_m4(mat, obmat); float invObmat[4][4]; invert_m4_m4(invObmat, ob_arm->obmat); - mult_m4_m4m4(pchan->pose_mat, invObmat, mat); + mul_m4_m4m4(pchan->pose_mat, invObmat, mat); } diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 71a16df3b26..4c6f71ff1a6 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -513,11 +513,11 @@ std::string ControllerExporter::add_inv_bind_mats_source(Object *ob_arm, ListBas float temp[4][4]; unit_m4(temp); copy_v3_v3(temp[3], pchan->bone->arm_mat[3]); - mult_m4_m4m4(world, ob_arm->obmat, temp); + mul_m4_m4m4(world, ob_arm->obmat, temp); } else { // make world-space matrix, arm_mat is armature-space - mult_m4_m4m4(world, ob_arm->obmat, pchan->bone->arm_mat); + mul_m4_m4m4(world, ob_arm->obmat, pchan->bone->arm_mat); } invert_m4_m4(mat, world); diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 41bd561f86d..0abf413788f 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -406,7 +406,7 @@ Object *DocumentImporter::create_instance_node(Object *source_ob, COLLADAFW::Nod } } // calc new matrix and apply - mult_m4_m4m4(obn->obmat, obn->obmat, mat); + mul_m4_m4m4(obn->obmat, obn->obmat, mat); BKE_object_apply_mat4(obn, obn->obmat, 0, 0); } } diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp index e0ba77e2554..43faa15b4bb 100644 --- a/source/blender/collada/TransformReader.cpp +++ b/source/blender/collada/TransformReader.cpp @@ -67,7 +67,7 @@ void TransformReader::get_node_mat(float mat[4][4], COLLADAFW::Node *node, std:: } copy_m4_m4(copy, mat); - mult_m4_m4m4(mat, copy, cur); + mul_m4_m4m4(mat, copy, cur); if (animation_map) { // AnimationList that drives this Transformation diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index c530135bc4d..efefca86d3e 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -40,7 +40,7 @@ void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[4][4], if (parent_mat) { float invpar[4][4]; invert_m4_m4(invpar, parent_mat); - mult_m4_m4m4(local, invpar, mat); + mul_m4_m4m4(local, invpar, mat); } else { copy_m4_m4(local, mat); @@ -82,7 +82,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B // calculate local mat invert_m4_m4(imat, ob->parent->obmat); - mult_m4_m4m4(mat, imat, tmat); + mul_m4_m4m4(mat, imat, tmat); // done diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 66cef6dd20a..65d6a13dd18 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -102,7 +102,7 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space) BKE_object_where_is_calc(sce, par); // move child obmat into world space - mult_m4_m4m4(mat, par->obmat, ob->obmat); + mul_m4_m4m4(mat, par->obmat, ob->obmat); copy_m4_m4(ob->obmat, mat); } @@ -376,8 +376,8 @@ void bc_match_scale(std::vector<Object *> *objects_done, ++it) { ob = *it; - mult_m4_m4m4(ob->obmat, size_mat4, ob->obmat); - mult_m4_m4m4(ob->obmat, bc_unit.get_rotation(), ob->obmat); + mul_m4_m4m4(ob->obmat, size_mat4, ob->obmat); + mul_m4_m4m4(ob->obmat, bc_unit.get_rotation(), ob->obmat); BKE_object_apply_mat4(ob, ob->obmat, 0, 0); } diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 3a4dc31c82d..7ed7ebbb4b9 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -209,7 +209,7 @@ int join_armature_exec(bContext *C, wmOperator *UNUSED(op)) /* Find the difference matrix */ invert_m4_m4(oimat, ob->obmat); - mult_m4_m4m4(mat, oimat, base->object->obmat); + mul_m4_m4m4(mat, oimat, base->object->obmat); /* Copy bones and posechannels from the object to the edit armature */ for (pchan = opose->chanbase.first; pchan; pchan = pchann) { @@ -245,7 +245,7 @@ int join_armature_exec(bContext *C, wmOperator *UNUSED(op)) /* Find the roll */ invert_m4_m4(imat, premat); - mult_m4_m4m4(difmat, imat, postmat); + mul_m4_m4m4(difmat, imat, postmat); curbone->roll -= (float)atan2(difmat[2][0], difmat[2][2]); } diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 0bc00206d93..60e107b9c15 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6088,7 +6088,7 @@ int join_curve_exec(bContext *C, wmOperator *UNUSED(op)) if (cu->nurb.first) { /* watch it: switch order here really goes wrong */ - mult_m4_m4m4(cmat, imat, base->object->obmat); + mul_m4_m4m4(cmat, imat, base->object->obmat); nu = cu->nurb.first; while (nu) { diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index a83a65f2487..c1017dfce7c 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -165,7 +165,7 @@ static short edbm_extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, if (mmd->mirror_ob) { float imtx[4][4]; invert_m4_m4(imtx, mmd->mirror_ob->obmat); - mult_m4_m4m4(mtx, imtx, obedit->obmat); + mul_m4_m4m4(mtx, imtx, obedit->obmat); } BM_ITER_MESH (edge, &iter, bm, BM_EDGES_OF_MESH) { diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 05434b76d51..d36b8fffa21 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -2900,7 +2900,7 @@ static void knife_recalc_projmat(KnifeTool_OpData *kcd) { invert_m4_m4(kcd->ob->imat, kcd->ob->obmat); ED_view3d_ob_project_mat_get(kcd->ar->regiondata, kcd->ob, kcd->projmat); - //mult_m4_m4m4(kcd->projmat, kcd->vc.rv3d->winmat, kcd->vc.rv3d->viewmat); + //mul_m4_m4m4(kcd->projmat, kcd->vc.rv3d->winmat, kcd->vc.rv3d->viewmat); kcd->is_ortho = ED_view3d_clip_range_get(kcd->vc.v3d, kcd->vc.rv3d, &kcd->clipsta, &kcd->clipend, true); diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index fb798a7e7d8..350da905015 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3226,7 +3226,7 @@ static void sort_bmelem_flag(Scene *scene, Object *ob, float fact = reverse ? -1.0 : 1.0; int coidx = (action == SRT_VIEW_ZAXIS) ? 2 : 0; - mult_m4_m4m4(mat, rv3d->viewmat, ob->obmat); /* Apply the view matrix to the object matrix. */ + mul_m4_m4m4(mat, rv3d->viewmat, ob->obmat); /* Apply the view matrix to the object matrix. */ if (totelem[0]) { pb = pblock[0] = MEM_callocN(sizeof(char) * totelem[0], "sort_bmelem vert pblock"); diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 5f451a542e6..48bd96251a6 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -341,7 +341,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) /* if this is the object we're merging into, no need to do anything */ if (base->object != ob) { /* watch this: switch matmul order really goes wrong */ - mult_m4_m4m4(cmat, imat, base->object->obmat); + mul_m4_m4m4(cmat, imat, base->object->obmat); /* transform vertex coordinates into new space */ for (a = 0, mv = mvert; a < me->totvert; a++, mv++) { diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 2ba5fb24292..8af9401e30f 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -773,7 +773,7 @@ static void child_get_inverse_matrix(Scene *scene, Object *ob, bConstraint *con, * the effect of the constraint */ invert_m4_m4(imat, pchan->pose_mat); - mult_m4_m4m4(tmat, pmat, imat); + mul_m4_m4m4(tmat, pmat, imat); invert_m4_m4(invmat, tmat); /* 5. restore constraints */ diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 69ad3f3225f..861dd4003e1 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -703,7 +703,7 @@ static int object_hook_reset_exec(bContext *C, wmOperator *op) float imat[4][4], mat[4][4]; /* calculate the world-space matrix for the pose-channel target first, then carry on as usual */ - mult_m4_m4m4(mat, hmd->object->obmat, pchan->pose_mat); + mul_m4_m4m4(mat, hmd->object->obmat, pchan->pose_mat); invert_m4_m4(imat, mat); mul_serie_m4(hmd->parentinv, imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 9e3f4a66e4d..02481ec5222 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -618,7 +618,7 @@ static bool ed_vgroup_transfer_weight(Object *ob_dst, Object *ob_src, bDeformGro /* Prepare transformation matrix.*/ invert_m4_m4(ob_src->imat, ob_src->obmat); - mult_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat); + mul_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat); /* Clear weights.*/ if (replace_mode == WT_REPLACE_ALL_WEIGHTS) { diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index d205b3ff4f9..33da5cc5cb5 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -2930,8 +2930,8 @@ static void project_paint_begin(ProjPaintState *ps) } /* same as #ED_view3d_ob_project_mat_get */ - mult_m4_m4m4(vmat, viewmat, ps->ob->obmat); - mult_m4_m4m4(ps->projectMat, winmat, vmat); + mul_m4_m4m4(vmat, viewmat, ps->ob->obmat); + mul_m4_m4m4(ps->projectMat, winmat, vmat); } diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 5feb59c6082..4665b82eb5a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -2249,7 +2249,7 @@ static int wpaint_stroke_test_start(bContext *C, wmOperator *op, const float UNU copy_wpaint_prev(wp, me->dvert, me->totvert); /* imat for normals */ - mult_m4_m4m4(mat, wpd->vc.rv3d->viewmat, ob->obmat); + mul_m4_m4m4(mat, wpd->vc.rv3d->viewmat, ob->obmat); invert_m4_m4(imat, mat); copy_m3_m4(wpd->wpimat, imat); @@ -2318,7 +2318,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P ED_view3d_init_mats_rv3d(ob, vc->rv3d); /* load projection matrix */ - mult_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat); + mul_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat); RNA_float_get_array(itemptr, "mouse", mval); @@ -2859,7 +2859,7 @@ static int vpaint_stroke_test_start(bContext *C, struct wmOperator *op, const fl copy_vpaint_prev(vp, (unsigned int *)me->mloopcol, me->totloop); /* some old cruft to sort out later */ - mult_m4_m4m4(mat, vpd->vc.rv3d->viewmat, ob->obmat); + mul_m4_m4m4(mat, vpd->vc.rv3d->viewmat, ob->obmat); invert_m4_m4(imat, mat); copy_m3_m4(vpd->vpimat, imat); @@ -3002,7 +3002,7 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P ED_view3d_init_mats_rv3d(ob, vc->rv3d); /* load projection matrix */ - mult_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat); + mul_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat); /* which faces are involved */ if (vp->flag & VP_AREA) { diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 13049aa5536..889b8b7c79c 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1256,7 +1256,7 @@ static void calc_brush_local_mat(const Brush *brush, Object *ob, /* Scale by brush radius */ normalize_m4(mat); scale_m4_fl(scale, cache->radius); - mult_m4_m4m4(tmat, mat, scale); + mul_m4_m4m4(tmat, mat, scale); /* Return inverse (for converting from modelspace coords to local * area coords) */ @@ -2729,7 +2729,7 @@ static void do_clay_strips_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int t /* scale mat */ scale_m4_fl(scale, ss->cache->radius); - mult_m4_m4m4(tmat, mat, scale); + mul_m4_m4m4(tmat, mat, scale); invert_m4_m4(mat, tmat); #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index ffa4ee2a1d8..756492ea0f0 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1904,7 +1904,7 @@ static void object_solver_inverted_matrix(Scene *scene, Object *ob, float invmat BKE_object_where_is_calc_mat4(scene, cam, invmat); } - mult_m4_m4m4(invmat, invmat, data->invmat); + mul_m4_m4m4(invmat, invmat, data->invmat); found = TRUE; } @@ -2108,7 +2108,7 @@ static void set_axis(Scene *scene, Object *ob, MovieClip *clip, MovieTrackingOb if (is_camera) { invert_m4(mat); - mult_m4_m4m4(mat, mat, obmat); + mul_m4_m4m4(mat, mat, obmat); } else { if (!flip) { @@ -2125,7 +2125,7 @@ static void set_axis(Scene *scene, Object *ob, MovieClip *clip, MovieTrackingOb mul_serie_m4(mat, lmat, mat, ilmat, obmat, NULL, NULL, NULL, NULL); } else { - mult_m4_m4m4(mat, obmat, mat); + mul_m4_m4m4(mat, obmat, mat); } } @@ -2217,14 +2217,14 @@ static int set_plane_exec(bContext *C, wmOperator *op) invert_m4(mat); BKE_object_to_mat4(object, obmat); - mult_m4_m4m4(mat, mat, obmat); - mult_m4_m4m4(newmat, rot, mat); + mul_m4_m4m4(mat, mat, obmat); + mul_m4_m4m4(newmat, rot, mat); BKE_object_apply_mat4(object, newmat, 0, 0); /* make camera have positive z-coordinate */ if (object->loc[2] < 0) { invert_m4(rot); - mult_m4_m4m4(newmat, rot, mat); + mul_m4_m4m4(newmat, rot, mat); BKE_object_apply_mat4(object, newmat, 0, 0); } } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 9517dae762a..54231808e75 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2189,7 +2189,7 @@ static void draw_dm_verts(BMEditMesh *em, DerivedMesh *dm, int sel, BMVert *eve_ /* For skin root drawing */ data.has_vskin = CustomData_has_layer(&em->bm->vdata, CD_MVERT_SKIN); /* view-aligned matrix */ - mult_m4_m4m4(data.imat, rv3d->viewmat, em->ob->obmat); + mul_m4_m4m4(data.imat, rv3d->viewmat, em->ob->obmat); invert_m4(data.imat); bglBegin(GL_POINTS); @@ -4251,7 +4251,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv if ((base->flag & OB_FROMDUPLI) && (ob->flag & OB_FROMGROUP)) { float mat[4][4]; - mult_m4_m4m4(mat, ob->obmat, psys->imat); + mul_m4_m4m4(mat, ob->obmat, psys->imat); glMultMatrixf(mat); } diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 363eea480b9..4c888f2f6c6 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -226,8 +226,8 @@ bool ED_view3d_context_user_region(bContext *C, View3D **r_v3d, ARegion **r_ar) void ED_view3d_init_mats_rv3d(struct Object *ob, struct RegionView3D *rv3d) { /* local viewmat and persmat, to calculate projections */ - mult_m4_m4m4(rv3d->viewmatob, rv3d->viewmat, ob->obmat); - mult_m4_m4m4(rv3d->persmatob, rv3d->persmat, ob->obmat); + mul_m4_m4m4(rv3d->viewmatob, rv3d->viewmat, ob->obmat); + mul_m4_m4m4(rv3d->persmatob, rv3d->persmat, ob->obmat); /* initializes object space clipping, speeds up clip tests */ ED_view3d_clipping_local(rv3d, ob->obmat); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index e8b480c1f23..8dbaabb0440 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2238,7 +2238,7 @@ void draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d) setwinmatrixview3d(ar, v3d, NULL); setviewmatrixview3d(scene, v3d, rv3d); /* note: calls BKE_object_where_is_calc for camera... */ - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); invert_m4_m4(rv3d->persinv, rv3d->persmat); invert_m4_m4(rv3d->viewinv, rv3d->viewmat); @@ -2275,7 +2275,7 @@ void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (*func)(void *), boo setwinmatrixview3d(ar, v3d, NULL); setviewmatrixview3d(scene, v3d, rv3d); /* note: calls BKE_object_where_is_calc for camera... */ - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); invert_m4_m4(rv3d->persinv, rv3d->persmat); invert_m4_m4(rv3d->viewinv, rv3d->viewmat); @@ -2467,7 +2467,7 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d) copy_m4_m4(rv3d.winmat, winmat); copy_m4_m4(rv3d.viewmat, viewmat); invert_m4_m4(rv3d.viewinv, rv3d.viewmat); - mult_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat); + mul_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat); invert_m4_m4(rv3d.persinv, rv3d.viewinv); /* no need to call ED_view3d_draw_offscreen_init since shadow buffers were already updated */ @@ -2540,7 +2540,7 @@ void ED_view3d_update_viewmat(Scene *scene, View3D *v3d, ARegion *ar, float view setviewmatrixview3d(scene, v3d, rv3d); /* note: calls BKE_object_where_is_calc for camera... */ /* update utilitity matrices */ - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); invert_m4_m4(rv3d->persinv, rv3d->persmat); invert_m4_m4(rv3d->viewinv, rv3d->viewmat); @@ -2840,7 +2840,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(Scene *scene, Object *camera, int w v3d.lens = params.lens; } - mult_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat); + mul_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat); invert_m4_m4(rv3d.persinv, rv3d.viewinv); return ED_view3d_draw_offscreen_imbuf(scene, &v3d, &ar, width, height, flag, diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 4154318e979..378bb181b35 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -145,9 +145,9 @@ bool ED_view3d_camera_lock_sync(View3D *v3d, RegionView3D *rv3d) ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); invert_m4_m4(v3d->camera->imat, v3d->camera->obmat); - mult_m4_m4m4(diff_mat, view_mat, v3d->camera->imat); + mul_m4_m4m4(diff_mat, view_mat, v3d->camera->imat); - mult_m4_m4m4(parent_mat, diff_mat, root_parent->obmat); + mul_m4_m4m4(parent_mat, diff_mat, root_parent->obmat); BKE_object_tfm_protected_backup(root_parent, &obtfm); BKE_object_apply_mat4(root_parent, parent_mat, true, false); diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 4c267905834..5957f743665 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -740,11 +740,11 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly, ED_view3d_to_m4(prev_view_mat, fly->rv3d->ofs, fly->rv3d->viewquat, fly->rv3d->dist); invert_m4_m4(prev_view_imat, prev_view_mat); ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); - mult_m4_m4m4(diff_mat, view_mat, prev_view_imat); - mult_m4_m4m4(parent_mat, diff_mat, fly->root_parent->obmat); + mul_m4_m4m4(diff_mat, view_mat, prev_view_imat); + mul_m4_m4m4(parent_mat, diff_mat, fly->root_parent->obmat); size_to_mat4(size_mat, fly->root_parent->size); - mult_m4_m4m4(parent_mat, parent_mat, size_mat); + mul_m4_m4m4(parent_mat, parent_mat, size_mat); BKE_object_apply_mat4(fly->root_parent, parent_mat, true, false); @@ -764,7 +764,7 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly, ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); size_to_mat4(size_mat, v3d->camera->size); - mult_m4_m4m4(view_mat, view_mat, size_mat); + mul_m4_m4m4(view_mat, view_mat, size_mat); BKE_object_apply_mat4(v3d->camera, view_mat, true, false); diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index 00826d277bd..6a0701331cc 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -546,8 +546,8 @@ void ED_view3d_ob_project_mat_get(const RegionView3D *rv3d, Object *ob, float pm { float vmat[4][4]; - mult_m4_m4m4(vmat, (float (*)[4])rv3d->viewmat, ob->obmat); - mult_m4_m4m4(pmat, (float (*)[4])rv3d->winmat, vmat); + mul_m4_m4m4(vmat, (float (*)[4])rv3d->viewmat, ob->obmat); + mul_m4_m4m4(pmat, (float (*)[4])rv3d->winmat, vmat); } /** diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 2a1e6d0fc5c..5a79b0dad41 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -116,7 +116,7 @@ void view3d_get_transformation(const ARegion *ar, RegionView3D *rv3d, Object *ob int i, j; if (ob) { - mult_m4_m4m4(cpy, rv3d->viewmat, ob->obmat); + mul_m4_m4m4(cpy, rv3d->viewmat, ob->obmat); } else { copy_m4_m4(cpy, rv3d->viewmat); diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 64ac4129dd4..c864a3a78b4 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -862,7 +862,7 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3]) BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, scene->r.cfra, imat); invert_m4(imat); - mult_m4_m4m4(obmat, cammat, imat); + mul_m4_m4m4(obmat, cammat, imat); } while (track) { diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 0728e3a4d93..15641f35b35 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -622,7 +622,7 @@ bool ED_view3d_boundbox_clip(RegionView3D *rv3d, float obmat[4][4], const BoundB if (bb == NULL) return true; if (bb->flag & OB_BB_DISABLED) return true; - mult_m4_m4m4(mat, rv3d->persmat, obmat); + mul_m4_m4m4(mat, rv3d->persmat, obmat); for (a = 0; a < 8; a++) { copy_v3_v3(vec, bb->vec[a]); @@ -905,7 +905,7 @@ short view3d_opengl_select(ViewContext *vc, unsigned int *buffer, unsigned int b } setwinmatrixview3d(ar, v3d, &rect); - mult_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); + mul_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = TRUE; @@ -983,7 +983,7 @@ short view3d_opengl_select(ViewContext *vc, unsigned int *buffer, unsigned int b G.f &= ~G_PICKSEL; setwinmatrixview3d(ar, v3d, NULL); - mult_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); + mul_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = 0; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index a32a6b031b8..ad1661f6e36 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -166,7 +166,7 @@ static void clipMirrorModifier(TransInfo *t, Object *ob) float obinv[4][4]; invert_m4_m4(obinv, mmd->mirror_ob->obmat); - mult_m4_m4m4(mtx, obinv, ob->obmat); + mul_m4_m4m4(mtx, obinv, ob->obmat); invert_m4_m4(imtx, mtx); } diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 18ad9402116..f336fc4651b 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1682,7 +1682,7 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl rect.ymax = mval[1] + hotspot; setwinmatrixview3d(ar, v3d, &rect); - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); glSelectBuffer(64, buffer); glRenderMode(GL_SELECT); @@ -1704,7 +1704,7 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl G.f &= ~G_PICKSEL; setwinmatrixview3d(ar, v3d, NULL); - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); if (hits == 1) return buffer[3]; else if (hits > 1) { diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index a793286bceb..044b699a042 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -290,13 +290,13 @@ void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double tim } if (material->dynproperty & DYN_LAMP_IMAT) { - mult_m4_m4m4(lamp->dynimat, lamp->imat, viewinv); + mul_m4_m4m4(lamp->dynimat, lamp->imat, viewinv); } if (material->dynproperty & DYN_LAMP_PERSMAT) { if (!GPU_lamp_has_shadow_buffer(lamp)) /* The lamp matrices are already updated if we're using shadow buffers */ GPU_lamp_update_buffer_mats(lamp); - mult_m4_m4m4(lamp->dynpersmat, lamp->persmat, viewinv); + mul_m4_m4m4(lamp->dynpersmat, lamp->persmat, viewinv); } } @@ -1884,7 +1884,7 @@ void GPU_lamp_update_buffer_mats(GPULamp *lamp) normalize_v3(lamp->viewmat[2]); /* makeshadowbuf */ - mult_m4_m4m4(persmat, lamp->winmat, lamp->viewmat); + mul_m4_m4m4(persmat, lamp->winmat, lamp->viewmat); /* opengl depth buffer is range 0.0..1.0 instead of -1.0..1.0 in blender */ unit_m4(rangemat); @@ -1895,7 +1895,7 @@ void GPU_lamp_update_buffer_mats(GPULamp *lamp) rangemat[3][1] = 0.5f; rangemat[3][2] = 0.5f; - mult_m4_m4m4(lamp->persmat, rangemat, persmat); + mul_m4_m4m4(lamp->persmat, rangemat, persmat); } void GPU_lamp_shadow_buffer_bind(GPULamp *lamp, float viewmat[4][4], int *winsize, float winmat[4][4]) diff --git a/source/blender/ikplugin/intern/iksolver_plugin.c b/source/blender/ikplugin/intern/iksolver_plugin.c index 9ec115f10e8..c3b6df8ac85 100644 --- a/source/blender/ikplugin/intern/iksolver_plugin.c +++ b/source/blender/ikplugin/intern/iksolver_plugin.c @@ -198,7 +198,7 @@ static void make_dmats(bPoseChannel *pchan) if (pchan->parent) { float iR_parmat[4][4]; invert_m4_m4(iR_parmat, pchan->parent->pose_mat); - mult_m4_m4m4(pchan->chan_mat, iR_parmat, pchan->pose_mat); // delta mat + mul_m4_m4m4(pchan->chan_mat, iR_parmat, pchan->pose_mat); // delta mat } else { copy_m4_m4(pchan->chan_mat, pchan->pose_mat); @@ -217,7 +217,7 @@ static void where_is_ik_bone(bPoseChannel *pchan, float ik_mat[3][3]) // nr = if (pchan->parent) mul_serie_m4(pchan->pose_mat, pchan->parent->pose_mat, pchan->chan_mat, ikmat, NULL, NULL, NULL, NULL, NULL); else - mult_m4_m4m4(pchan->pose_mat, pchan->chan_mat, ikmat); + mul_m4_m4m4(pchan->pose_mat, pchan->chan_mat, ikmat); /* calculate head */ copy_v3_v3(pchan->pose_head, pchan->pose_mat[3]); @@ -362,7 +362,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree) unit_m4(rootmat); copy_v3_v3(rootmat[3], pchan->pose_head); - mult_m4_m4m4(imat, ob->obmat, rootmat); + mul_m4_m4m4(imat, ob->obmat, rootmat); invert_m4_m4(goalinv, imat); for (target = tree->targets.first; target; target = target->next) { @@ -377,7 +377,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree) BKE_get_constraint_target_matrix(scene, target->con, 0, CONSTRAINT_OBTYPE_OBJECT, ob, rootmat, 1.0); /* and set and transform goal */ - mult_m4_m4m4(goal, goalinv, rootmat); + mul_m4_m4m4(goal, goalinv, rootmat); copy_v3_v3(goalpos, goal[3]); copy_m3_m4(goalrot, goal); @@ -392,7 +392,7 @@ static void execute_posetree(struct Scene *scene, Object *ob, PoseTree *tree) break; } else { - mult_m4_m4m4(goal, goalinv, rootmat); + mul_m4_m4m4(goal, goalinv, rootmat); copy_v3_v3(polepos, goal[3]); poleconstrain = 1; diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index 96bdb6c9bdd..53597fb9be0 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -569,7 +569,7 @@ static bool target_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Fram mul_serie_m4(restmat, target->owner->obmat, chanmat, target->eeRest, NULL, NULL, NULL, NULL, NULL); } else { - mult_m4_m4m4(restmat, target->owner->obmat, target->eeRest); + mul_m4_m4m4(restmat, target->owner->obmat, target->eeRest); } // blend the target blend_m4_m4m4(tarmat, restmat, tarmat, constraint->enforce); @@ -597,7 +597,7 @@ static bool base_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Frame& ikscene->baseFrame.setValue(&chanmat[0][0]); // iTaSC armature is scaled to object scale, scale the base frame too ikscene->baseFrame.p *= ikscene->blScale; - mult_m4_m4m4(rootmat, ikscene->blArmature->obmat, chanmat); + mul_m4_m4m4(rootmat, ikscene->blArmature->obmat, chanmat); } else { copy_m4_m4(rootmat, ikscene->blArmature->obmat); @@ -622,11 +622,11 @@ static bool base_callback(const iTaSC::Timestamp& timestamp, const iTaSC::Frame& // get polar target matrix in world space BKE_get_constraint_target_matrix(ikscene->blscene, ikscene->polarConstraint, 1, CONSTRAINT_OBTYPE_OBJECT, ikscene->blArmature, mat, 1.0); // convert to armature space - mult_m4_m4m4(polemat, imat, mat); + mul_m4_m4m4(polemat, imat, mat); // get the target in world space (was computed before as target object are defined before base object) iktarget->target->getPose().getValue(mat[0]); // convert to armature space - mult_m4_m4m4(goalmat, imat, mat); + mul_m4_m4m4(goalmat, imat, mat); // take position of target, polar target, end effector, in armature space KDL::Vector goalpos(goalmat[3]); KDL::Vector polepos(polemat[3]); @@ -1017,7 +1017,7 @@ static void convert_pose(IK_Scene *ikscene) copy_m4_m4(bmat, bone->arm_mat); } invert_m4_m4(rmat, bmat); - mult_m4_m4m4(bmat, rmat, pchan->pose_mat); + mul_m4_m4m4(bmat, rmat, pchan->pose_mat); normalize_m4(bmat); boneRot.setValue(bmat[0]); GetJointRotation(boneRot, ikchan->jointType, rot); @@ -1456,7 +1456,7 @@ static IK_Scene *convert_tree(Scene *blscene, Object *ob, bPoseChannel *pchan, f copy_m4_m4(mat, pchan->bone->arm_mat); copy_v3_v3(mat[3], pchan->bone->arm_tail); // get the rest pose relative to the armature base - mult_m4_m4m4(iktarget->eeRest, invBaseFrame, mat); + mul_m4_m4m4(iktarget->eeRest, invBaseFrame, mat); iktarget->eeBlend = (!ikscene->polarConstraint && condata->type == CONSTRAINT_IK_COPYPOSE) ? true : false; // use target_callback to make sure the initPose includes enforce coefficient target_callback(iTaSC::Timestamp(), iTaSC::F_identity, initPose, iktarget); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 23bcbbb8794..c6ce185d9f3 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -220,7 +220,7 @@ static void rna_Object_matrix_local_get(PointerRNA *ptr, float values[16]) if (ob->parent) { float invmat[4][4]; /* for inverse of parent's matrix */ invert_m4_m4(invmat, ob->parent->obmat); - mult_m4_m4m4((float(*)[4])values, invmat, ob->obmat); + mul_m4_m4m4((float(*)[4])values, invmat, ob->obmat); } else { copy_m4_m4((float(*)[4])values, ob->obmat); @@ -237,7 +237,7 @@ static void rna_Object_matrix_local_set(PointerRNA *ptr, const float values[16]) if (ob->parent) { float invmat[4][4]; invert_m4_m4(invmat, ob->parentinv); - mult_m4_m4m4(ob->obmat, invmat, (float(*)[4])values); + mul_m4_m4m4(ob->obmat, invmat, (float(*)[4])values); } else { copy_m4_m4(ob->obmat, (float(*)[4])values); diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 5e90aa10294..a1fdae5792c 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -418,7 +418,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, for (j = 0; j < count - 1; j++) { float tmp_mat[4][4]; - mult_m4_m4m4(tmp_mat, offset, final_offset); + mul_m4_m4m4(tmp_mat, offset, final_offset); copy_m4_m4(final_offset, tmp_mat); } @@ -539,7 +539,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, if (end_cap) { float endoffset[4][4]; - mult_m4_m4m4(endoffset, offset, final_offset); + mul_m4_m4m4(endoffset, offset, final_offset); bm_merge_dm_transform(bm, end_cap, endoffset, amd, &dupe_op, (count == 1) ? dupe_op.slots_in : dupe_op.slots_out, (count == 1) ? "geom" : "geom.out", &weld_op); diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c index 0616db36afa..ed5bb1d3f4d 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.c +++ b/source/blender/modifiers/intern/MOD_boolean_util.c @@ -526,7 +526,7 @@ static DerivedMesh *NewBooleanDerivedMesh_intern( * we need to compute the inverse transform from global to ob (inv_mat), * and the transform from ob to ob_select for use in interpolation (map_mat) */ invert_m4_m4(inv_mat, ob->obmat); - mult_m4_m4m4(map_mat, inv_mat, ob_select->obmat); + mul_m4_m4m4(map_mat, inv_mat, ob_select->obmat); invert_m4_m4(inv_mat, ob_select->obmat); { diff --git a/source/blender/modifiers/intern/MOD_cast.c b/source/blender/modifiers/intern/MOD_cast.c index d5620f91d6e..7c8f8bfc82f 100644 --- a/source/blender/modifiers/intern/MOD_cast.c +++ b/source/blender/modifiers/intern/MOD_cast.c @@ -158,7 +158,7 @@ static void sphere_do( if (ctrl_ob) { if (flag & MOD_CAST_USE_OB_TRANSFORM) { invert_m4_m4(ctrl_ob->imat, ctrl_ob->obmat); - mult_m4_m4m4(mat, ctrl_ob->imat, ob->obmat); + mul_m4_m4m4(mat, ctrl_ob->imat, ob->obmat); invert_m4_m4(imat, mat); } @@ -282,7 +282,7 @@ static void cuboid_do( if (ctrl_ob) { if (flag & MOD_CAST_USE_OB_TRANSFORM) { invert_m4_m4(ctrl_ob->imat, ctrl_ob->obmat); - mult_m4_m4m4(mat, ctrl_ob->imat, ob->obmat); + mul_m4_m4m4(mat, ctrl_ob->imat, ob->obmat); invert_m4_m4(imat, mat); } diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 19b6bc4a520..9d18c81d5bc 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -157,7 +157,7 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm, /* get world-space matrix of target, corrected for the space the verts are in */ if (hmd->subtarget[0] && pchan) { /* bone target if there's a matching pose-channel */ - mult_m4_m4m4(dmat, hmd->object->obmat, pchan->pose_mat); + mul_m4_m4m4(dmat, hmd->object->obmat, pchan->pose_mat); } else { /* just object target */ diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index dda711c28a3..f11ab3f0469 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -224,8 +224,8 @@ static void meshdeformModifier_do( /* compute matrices to go in and out of cage object space */ invert_m4_m4(imat, mmd->object->obmat); - mult_m4_m4m4(cagemat, imat, ob->obmat); - mult_m4_m4m4(cmat, mmd->bindmat, cagemat); + mul_m4_m4m4(cagemat, imat, ob->obmat); + mul_m4_m4m4(cmat, mmd->bindmat, cagemat); invert_m4_m4(iobmat, cmat); copy_m3_m4(icagemat, iobmat); diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 3c886bafc79..00c343d1918 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -126,7 +126,7 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, /* tmp is a transform from coords relative to the object's own origin, * to coords relative to the mirror object origin */ invert_m4_m4(tmp, mmd->mirror_ob->obmat); - mult_m4_m4m4(tmp, tmp, ob->obmat); + mul_m4_m4m4(tmp, tmp, ob->obmat); /* itmp is the reverse transform back to origin-relative coordinates */ invert_m4_m4(itmp, tmp); @@ -134,8 +134,8 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd, /* combine matrices to get a single matrix that translates coordinates into * mirror-object-relative space, does the mirror, and translates back to * origin-relative space */ - mult_m4_m4m4(mtx, mtx, tmp); - mult_m4_m4m4(mtx, itmp, mtx); + mul_m4_m4m4(mtx, mtx, tmp); + mul_m4_m4m4(mtx, itmp, mtx); } result = CDDM_from_template(dm, maxVerts * 2, maxEdges * 2, 0, maxLoops * 2, maxPolys * 2); diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 4ec132ce24d..bbafa8c939e 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -202,7 +202,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* calc the matrix relative to the axis object */ invert_m4_m4(mtx_tmp_a, ob->obmat); copy_m4_m4(mtx_tx_inv, ltmd->ob_axis->obmat); - mult_m4_m4m4(mtx_tx, mtx_tmp_a, mtx_tx_inv); + mul_m4_m4m4(mtx_tx, mtx_tmp_a, mtx_tx_inv); /* calc the axis vec */ mul_mat3_m4_v3(mtx_tx, axis_vec); /* only rotation component */ diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 45901f4a303..b6539f4b028 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -212,7 +212,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, params.viewplane.ymax *= scay; BKE_camera_params_compute_matrix(¶ms); - mult_m4_m4m4(tmpmat, params.winmat, projectors[i].projmat); + mul_m4_m4m4(tmpmat, params.winmat, projectors[i].projmat); } } else { @@ -223,7 +223,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, mul_mat3_m4_fl(offsetmat, 0.5); offsetmat[3][0] = offsetmat[3][1] = offsetmat[3][2] = 0.5; - mult_m4_m4m4(projectors[i].projmat, offsetmat, tmpmat); + mul_m4_m4m4(projectors[i].projmat, offsetmat, tmpmat); /* calculate worldspace projector normal (for best projector test) */ projectors[i].normal[0] = 0; diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index 7498d4dfce9..13629b02a86 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -98,7 +98,7 @@ static void matrix_from_obj_pchan(float mat[4][4], Object *ob, const char *bonen { bPoseChannel *pchan = BKE_pose_channel_find_name(ob->pose, bonename); if (pchan) { - mult_m4_m4m4(mat, ob->obmat, pchan->pose_mat); + mul_m4_m4m4(mat, ob->obmat, pchan->pose_mat); } else { copy_m4_m4(mat, ob->obmat); @@ -139,7 +139,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, matrix_from_obj_pchan(mat_dst, umd->object_dst, umd->bone_dst); invert_m4_m4(imat_dst, mat_dst); - mult_m4_m4m4(warp_mat, imat_dst, mat_src); + mul_m4_m4m4(warp_mat, imat_dst, mat_src); /* apply warp */ if (!is_zero_v2(umd->center)) { @@ -152,8 +152,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, invert_m4_m4(imat_cent, mat_cent); - mult_m4_m4m4(warp_mat, warp_mat, imat_cent); - mult_m4_m4m4(warp_mat, mat_cent, warp_mat); + mul_m4_m4m4(warp_mat, warp_mat, imat_cent); + mul_m4_m4m4(warp_mat, mat_cent, warp_mat); } /* make sure we're using an existing layer */ diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index c2a62231529..b63e293aa80 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -201,11 +201,11 @@ static void warpModifier_do(WarpModifierData *wmd, Object *ob, invert_m4_m4(obinv, ob->obmat); - mult_m4_m4m4(mat_from, obinv, wmd->object_from->obmat); - mult_m4_m4m4(mat_to, obinv, wmd->object_to->obmat); + mul_m4_m4m4(mat_from, obinv, wmd->object_from->obmat); + mul_m4_m4m4(mat_to, obinv, wmd->object_to->obmat); invert_m4_m4(tmat, mat_from); // swap? - mult_m4_m4m4(mat_final, tmat, mat_to); + mul_m4_m4m4(mat_final, tmat, mat_to); invert_m4_m4(mat_from_inv, mat_from); diff --git a/source/blender/modifiers/intern/MOD_wave.c b/source/blender/modifiers/intern/MOD_wave.c index b713f56a4c2..89599a4e386 100644 --- a/source/blender/modifiers/intern/MOD_wave.c +++ b/source/blender/modifiers/intern/MOD_wave.c @@ -193,7 +193,7 @@ static void waveModifier_do(WaveModifierData *md, float mat[4][4]; /* get the control object's location in local coordinates */ invert_m4_m4(ob->imat, ob->obmat); - mult_m4_m4m4(mat, ob->imat, wmd->objectcenter->obmat); + mul_m4_m4m4(mat, ob->imat, wmd->objectcenter->obmat); wmd->startx = mat[3][0]; wmd->starty = mat[3][1]; diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index c51fb244eb6..30cb0200794 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1659,14 +1659,14 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem } /* 2.5 setup matrices */ - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); invert_m4_m4(ob->imat, mat); /* need to be that way, for imat texture */ copy_m3_m4(nmat, ob->imat); transpose_m3(nmat); if (psys->flag & PSYS_USE_IMAT) { /* psys->imat is the original emitter's inverse matrix, ob->obmat is the duplicated object's matrix */ - mult_m4_m4m4(duplimat, ob->obmat, psys->imat); + mul_m4_m4m4(duplimat, ob->obmat, psys->imat); use_duplimat = TRUE; } @@ -2108,7 +2108,7 @@ static void make_render_halos(Render *re, ObjectRen *obr, Mesh *UNUSED(me), int float vec[3], hasize, mat[4][4], imat[3][3]; int a, ok, seed= ma->seed1; - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); copy_m3_m4(imat, ob->imat); re->flag |= R_HALO; @@ -2405,7 +2405,7 @@ static void init_render_mball(Render *re, ObjectRen *obr) if (ob!=BKE_mball_basis_find(re->scene, ob)) return; - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); invert_m4_m4(ob->imat, mat); copy_m3_m4(imat, ob->imat); negative_scale = is_negative_m4(mat); @@ -2800,7 +2800,7 @@ static void init_render_surf(Render *re, ObjectRen *obr, int timeoffset) nu= cu->nurb.first; if (nu==0) return; - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); invert_m4_m4(ob->imat, mat); /* material array */ @@ -2870,7 +2870,7 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset) dl= disp.first; if (dl==NULL) return; - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); invert_m4_m4(ob->imat, mat); /* local object -> world space transform for normals */ @@ -3324,7 +3324,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset) me= ob->data; - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); invert_m4_m4(ob->imat, mat); copy_m3_m4(imat, ob->imat); negative_scale= is_negative_m4(mat); @@ -3748,7 +3748,7 @@ static void initshadowbuf(Render *re, LampRen *lar, float mat[4][4]) /* matrix: combination of inverse view and lampmat */ /* calculate again: the ortho-render has no correct viewinv */ invert_m4_m4(viewinv, re->viewmat); - mult_m4_m4m4(shb->viewmat, shb->winmat, viewinv); + mul_m4_m4m4(shb->viewmat, shb->winmat, viewinv); /* projection */ shb->d= lar->clipsta; @@ -3826,7 +3826,7 @@ static GroupObject *add_render_lamp(Render *re, Object *ob) BLI_addtail(&re->lampren, lar); go->lampren= lar; - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); invert_m4_m4(ob->imat, mat); copy_m3_m4(lar->mat, mat); @@ -4569,7 +4569,7 @@ static void find_dupli_instances(Render *re, ObjectRen *obr) float imat[4][4], obmat[4][4], obimat[4][4], nmat[3][3]; int first = 1; - mult_m4_m4m4(obmat, re->viewmat, obr->obmat); + mul_m4_m4m4(obmat, re->viewmat, obr->obmat); invert_m4_m4(imat, obmat); /* for objects instanced by dupliverts/faces/particles, we go over the @@ -4582,7 +4582,7 @@ static void find_dupli_instances(Render *re, ObjectRen *obr) /* compute difference between object matrix and * object matrix with dupli transform, in viewspace */ copy_m4_m4(obimat, obi->mat); - mult_m4_m4m4(obi->mat, obimat, imat); + mul_m4_m4m4(obi->mat, obimat, imat); copy_m3_m4(nmat, obi->mat); invert_m3_m3(obi->nmat, nmat); @@ -4604,7 +4604,7 @@ static void assign_dupligroup_dupli(Render *re, ObjectInstanceRen *obi, ObjectRe { float imat[4][4], obmat[4][4], obimat[4][4], nmat[3][3]; - mult_m4_m4m4(obmat, re->viewmat, obr->obmat); + mul_m4_m4m4(obmat, re->viewmat, obr->obmat); invert_m4_m4(imat, obmat); obi->obr= obr; @@ -4612,7 +4612,7 @@ static void assign_dupligroup_dupli(Render *re, ObjectInstanceRen *obi, ObjectRe /* compute difference between object matrix and * object matrix with dupli transform, in viewspace */ copy_m4_m4(obimat, obi->mat); - mult_m4_m4m4(obi->mat, obimat, imat); + mul_m4_m4m4(obi->mat, obimat, imat); copy_m3_m4(nmat, obi->mat); invert_m3_m3(obi->nmat, nmat); @@ -4814,7 +4814,7 @@ static void init_render_object(Render *re, Object *ob, Object *par, DupliObject else if (render_object_type(ob->type)) add_render_object(re, ob, par, dob, timeoffset); else { - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); invert_m4_m4(ob->imat, mat); } @@ -5066,7 +5066,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp * See bug: [#28744] - campbell */ for (ob= re->main->object.first; ob; ob= ob->id.next) { /* imat objects has to be done here, since displace can have texture using Object map-input */ - mult_m4_m4m4(mat, re->viewmat, ob->obmat); + mul_m4_m4m4(mat, re->viewmat, ob->obmat); invert_m4_m4(ob->imat_ren, mat); copy_m4_m4(ob->imat, ob->imat_ren); /* each object should only be rendered once */ @@ -5138,7 +5138,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp * this is a duplivert/face/particle, or it is a non-animated object in * a dupligroup that has already been created before */ if (dob->type != OB_DUPLIGROUP || (obr=find_dupligroup_dupli(re, obd, 0))) { - mult_m4_m4m4(mat, re->viewmat, dob->mat); + mul_m4_m4m4(mat, re->viewmat, dob->mat); /* ob = particle system, use that layer */ obi= RE_addRenderInstance(re, NULL, obd, ob, dob->persistent_id[0], 0, mat, ob->lay); @@ -5166,7 +5166,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp for (psys=obd->particlesystem.first; psys; psys=psys->next) { if (dob->type != OB_DUPLIGROUP || (obr=find_dupligroup_dupli(re, obd, psysindex))) { if (obi == NULL) - mult_m4_m4m4(mat, re->viewmat, dob->mat); + mul_m4_m4m4(mat, re->viewmat, dob->mat); obi= RE_addRenderInstance(re, NULL, obd, ob, dob->persistent_id[0], psysindex++, mat, obd->lay); set_dupli_tex_mat(re, obi, dob); @@ -5388,7 +5388,7 @@ void RE_DataBase_IncrementalView(Render *re, float viewmat[4][4], int restore) invert_m4_m4(oldviewinv, re->viewmat_orig); /* we have to correct for the already rotated vertexcoords */ - mult_m4_m4m4(tmat, viewmat, oldviewinv); + mul_m4_m4m4(tmat, viewmat, oldviewinv); copy_m4_m4(re->viewmat, viewmat); invert_m4_m4(re->viewinv, re->viewmat); @@ -5546,7 +5546,7 @@ static float *calculate_strandsurface_speedvectors(Render *re, ObjectInstanceRen int a; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(winmat, re->winmat, obi->mat); + mul_m4_m4m4(winmat, re->winmat, obi->mat); else copy_m4_m4(winmat, re->winmat); @@ -5583,7 +5583,7 @@ static void calculate_speedvectors(Render *re, ObjectInstanceRen *obi, float *ve int a, *face, *index; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(winmat, re->winmat, obi->mat); + mul_m4_m4m4(winmat, re->winmat, obi->mat); else copy_m4_m4(winmat, re->winmat); @@ -5677,7 +5677,7 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float * velarray = fss->meshVelocities; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(winmat, re->winmat, obi->mat); + mul_m4_m4m4(winmat, re->winmat, obi->mat); else copy_m4_m4(winmat, re->winmat); @@ -5766,7 +5766,7 @@ static void copy_dbase_object_vectors(Render *re, ListBase *lb) vec= obilb->vectors= MEM_mallocN(2*sizeof(float)*totvector, "vector array"); if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(winmat, re->winmat, obi->mat); + mul_m4_m4m4(winmat, re->winmat, obi->mat); else copy_m4_m4(winmat, re->winmat); diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c index 419c3d8ee23..4fba67cf711 100644 --- a/source/blender/render/intern/source/envmap.c +++ b/source/blender/render/intern/source/envmap.c @@ -257,7 +257,7 @@ static void env_set_imats(Render *re) base = re->scene->base.first; while (base) { - mult_m4_m4m4(mat, re->viewmat, base->object->obmat); + mul_m4_m4m4(mat, re->viewmat, base->object->obmat); invert_m4_m4(base->object->imat, mat); base = base->next; @@ -294,7 +294,7 @@ void env_rotate_scene(Render *re, float mat[4][4], int do_rotate) /* append or set matrix depending on dupli */ if (obi->flag & R_DUPLI_TRANSFORMED) { copy_m4_m4(tmpmat, obi->mat); - mult_m4_m4m4(obi->mat, tmat, tmpmat); + mul_m4_m4m4(obi->mat, tmat, tmpmat); } else if (do_rotate == 1) copy_m4_m4(obi->mat, tmat); @@ -329,9 +329,9 @@ void env_rotate_scene(Render *re, float mat[4][4], int do_rotate) /* copy from add_render_lamp */ if (do_rotate == 1) - mult_m4_m4m4(tmpmat, re->viewmat, go->ob->obmat); + mul_m4_m4m4(tmpmat, re->viewmat, go->ob->obmat); else - mult_m4_m4m4(tmpmat, re->viewmat_orig, go->ob->obmat); + mul_m4_m4m4(tmpmat, re->viewmat_orig, go->ob->obmat); invert_m4_m4(go->ob->imat, tmpmat); copy_m3_m4(lar->mat, tmpmat); @@ -362,10 +362,10 @@ void env_rotate_scene(Render *re, float mat[4][4], int do_rotate) if (lar->shb) { if (do_rotate == 1) { - mult_m4_m4m4(smat, lar->shb->viewmat, mat_inverse); - mult_m4_m4m4(lar->shb->persmat, lar->shb->winmat, smat); + mul_m4_m4m4(smat, lar->shb->viewmat, mat_inverse); + mul_m4_m4m4(lar->shb->persmat, lar->shb->winmat, smat); } - else mult_m4_m4m4(lar->shb->persmat, lar->shb->winmat, lar->shb->viewmat); + else mul_m4_m4m4(lar->shb->persmat, lar->shb->winmat, lar->shb->viewmat); } } } @@ -460,7 +460,7 @@ static void render_envmap(Render *re, EnvMap *env) normalize_m4(orthmat); /* need imat later for texture imat */ - mult_m4_m4m4(mat, re->viewmat, orthmat); + mul_m4_m4m4(mat, re->viewmat, orthmat); invert_m4_m4(tmat, mat); copy_m3_m4(env->obimat, tmat); @@ -479,7 +479,7 @@ static void render_envmap(Render *re, EnvMap *env) copy_m4_m4(envre->viewinv, tmat); /* we have to correct for the already rotated vertexcoords */ - mult_m4_m4m4(tmat, envre->viewmat, oldviewinv); + mul_m4_m4m4(tmat, envre->viewmat, oldviewinv); invert_m4_m4(env->imat, tmat); env_rotate_scene(envre, tmat, 1); @@ -561,7 +561,7 @@ void make_envmaps(Render *re) normalize_m4(orthmat); /* need imat later for texture imat */ - mult_m4_m4m4(mat, re->viewmat, orthmat); + mul_m4_m4m4(mat, re->viewmat, orthmat); invert_m4_m4(tmat, mat); copy_m3_m4(env->obimat, tmat); } diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index 82428f792bb..e86ae7ea063 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -119,7 +119,7 @@ static void pointdensity_cache_psys(Render *re, PointDensity *pd, Object *ob, Pa /* init everything */ if (!psys || !ob || !pd) return; - mult_m4_m4m4(obview, ob->obmat, re->viewinv); + mul_m4_m4m4(obview, ob->obmat, re->viewinv); /* Just to create a valid rendering context for particles */ psys_render_set(ob, psys, re->viewmat, re->winmat, re->winx, re->winy, 0); diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 837dfb3d8dd..a444588d627 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -2046,7 +2046,7 @@ static int ntap_bump_compute(NTapBump *ntap_bump, ShadeInput *shi, MTex *mtex, T if ( mtex->texflag & MTEX_BUMP_OBJECTSPACE ) { /* TODO: these calculations happen for every pixel! * -> move to shi->obi */ - mult_m4_m4m4(tmp, R.viewmat, shi->obr->ob->obmat); + mul_m4_m4m4(tmp, R.viewmat, shi->obr->ob->obmat); copy_m3_m4(obj2view, tmp); /* use only upper left 3x3 matrix */ invert_m3_m3(view2obj, obj2view); diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 7d463316a98..7cb37ce5aa6 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -645,7 +645,7 @@ static void shadowbuf_autoclip(Render *re, LampRen *lar) obr= obi->obr; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(obviewmat, viewmat, obi->mat); + mul_m4_m4m4(obviewmat, viewmat, obi->mat); else copy_m4_m4(obviewmat, viewmat); @@ -782,7 +782,7 @@ void makeshadowbuf(Render *re, LampRen *lar) wsize= shb->pixsize*(shb->size/2.0f); perspective_m4(shb->winmat, -wsize, wsize, -wsize, wsize, shb->d, shb->clipend); - mult_m4_m4m4(shb->persmat, shb->winmat, shb->viewmat); + mul_m4_m4m4(shb->persmat, shb->winmat, shb->viewmat); if (ELEM3(lar->buftype, LA_SHADBUF_REGULAR, LA_SHADBUF_HALFWAY, LA_SHADBUF_DEEP)) { shb->totbuf= lar->buffers; @@ -1995,7 +1995,7 @@ static void isb_bsp_fillfaces(Render *re, LampRen *lar, ISBBranch *root) obr= obi->obr; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(winmat, shb->persmat, obi->mat); + mul_m4_m4m4(winmat, shb->persmat, obi->mat); else copy_m4_m4(winmat, shb->persmat); diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index bf0087d0292..eb9e72fedfa 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -1144,7 +1144,7 @@ void shade_input_set_shade_texco(ShadeInput *shi) zbuf_make_winmat(&R, winmat); if (shi->obi->flag & R_TRANSFORMED) - mult_m4_m4m4(obwinmat, winmat, obi->mat); + mul_m4_m4m4(obwinmat, winmat, obi->mat); else copy_m4_m4(obwinmat, winmat); diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c index 9bfdf73f367..3485f2b1ccb 100644 --- a/source/blender/render/intern/source/strand.c +++ b/source/blender/render/intern/source/strand.c @@ -858,7 +858,7 @@ int zbuffer_strands_abuf(Render *re, RenderPart *pa, APixstrand *apixbuf, ListBa /* compute matrix and try clipping whole object */ if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(obwinmat, winmat, obi->mat); + mul_m4_m4m4(obwinmat, winmat, obi->mat); else copy_m4_m4(obwinmat, winmat); diff --git a/source/blender/render/intern/source/volumetric.c b/source/blender/render/intern/source/volumetric.c index fe4cff76093..3915d6bdd4b 100644 --- a/source/blender/render/intern/source/volumetric.c +++ b/source/blender/render/intern/source/volumetric.c @@ -243,7 +243,7 @@ static float metadensity(Object *ob, const float co[3]) /* transform co to meta-element */ float tco[3] = {co[0], co[1], co[2]}; - mult_m4_m4m4(mat, R.viewmat, ob->obmat); + mul_m4_m4m4(mat, R.viewmat, ob->obmat); invert_m4_m4(imat, mat); mul_m4_v3(imat, tco); diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index cc9717bd9d2..3b4ad7c91af 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -1837,7 +1837,7 @@ void zbuf_make_winmat(Render *re, float winmat[4][4]) panomat[2][0]= -re->panosi; panomat[2][2]= re->panoco; - mult_m4_m4m4(winmat, re->winmat, panomat); + mul_m4_m4m4(winmat, re->winmat, panomat); } else copy_m4_m4(winmat, re->winmat); @@ -2162,7 +2162,7 @@ void zbuffer_solid(RenderPart *pa, RenderLayer *rl, void(*fillfunc)(RenderPart * continue; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(obwinmat, winmat, obi->mat); + mul_m4_m4m4(obwinmat, winmat, obi->mat); else copy_m4_m4(obwinmat, winmat); @@ -2342,7 +2342,7 @@ void zbuffer_shadow(Render *re, float winmat[4][4], LampRen *lar, int *rectz, in continue; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(obwinmat, winmat, obi->mat); + mul_m4_m4m4(obwinmat, winmat, obi->mat); else copy_m4_m4(obwinmat, winmat); @@ -2582,7 +2582,7 @@ void zbuffer_sss(RenderPart *pa, unsigned int lay, void *handle, void (*func)(vo continue; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(obwinmat, winmat, obi->mat); + mul_m4_m4m4(obwinmat, winmat, obi->mat); else copy_m4_m4(obwinmat, winmat); @@ -3325,7 +3325,7 @@ static int zbuffer_abuf(Render *re, RenderPart *pa, APixstr *APixbuf, ListBase * continue; if (obi->flag & R_TRANSFORMED) - mult_m4_m4m4(obwinmat, winmat, obi->mat); + mul_m4_m4m4(obwinmat, winmat, obi->mat); else copy_m4_m4(obwinmat, winmat); diff --git a/source/gameengine/Converter/BL_ArmatureChannel.cpp b/source/gameengine/Converter/BL_ArmatureChannel.cpp index 11e90e1797d..cb33ff0e1e3 100644 --- a/source/gameengine/Converter/BL_ArmatureChannel.cpp +++ b/source/gameengine/Converter/BL_ArmatureChannel.cpp @@ -215,7 +215,7 @@ PyObject *BL_ArmatureChannel::py_attr_get_joint_rotation(void *self_v, const str normalize_m3(pose_mat); if (pchan->parent) { // bone has a parent, compute the rest pose of the bone taking actual pose of parent - mult_m3_m3m4(rest_mat, pchan->parent->pose_mat, pchan->bone->bone_mat); + mul_m3_m3m4(rest_mat, pchan->parent->pose_mat, pchan->bone->bone_mat); normalize_m3(rest_mat); } else { // otherwise, the bone matrix in armature space is the rest pose |