1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace mul_serie_m4 with mul_m4_m4m4 when only 3 args are given

Browse Source
This commit is contained in:
Campbell Barton 2013-08-06 01:45:29 +00:00
parent ce2e2b141e
commit b03bc88d21
6 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/avi/intern/avi_mjpeg.c
View File

@ -44,8 +44,6 @@
#include "avi_mjpeg.h" #include "avi_mjpeg.h"
#define PADUP(num, amt) ((num + (amt - 1)) & ~(amt - 1))
static void jpegmemdestmgr_build(j_compress_ptr cinfo, unsigned char *buffer, int bufsize); static void jpegmemdestmgr_build(j_compress_ptr cinfo, unsigned char *buffer, int bufsize);
static void jpegmemsrcmgr_build(j_decompress_ptr dinfo, unsigned char *buffer, int bufsize); static void jpegmemsrcmgr_build(j_decompress_ptr dinfo, unsigned char *buffer, int bufsize);

6
source/blender/blenkernel/intern/constraint.c
View File

@ -1227,7 +1227,7 @@ static void followpath_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstra
copy_v3_v3(totmat[3], vec); copy_v3_v3(totmat[3], vec);
mul_serie_m4(ct->matrix, ct->tar->obmat, totmat, NULL, NULL, NULL, NULL, NULL, NULL); mul_m4_m4m4(ct->matrix, ct->tar->obmat, totmat);
} }
} }
} }
@ -1253,7 +1253,7 @@ static void followpath_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *
mat4_to_size(size, cob->matrix); mat4_to_size(size, cob->matrix);
/* apply targetmat - containing location on path, and rotation */ /* apply targetmat - containing location on path, and rotation */
mul_serie_m4(cob->matrix, ct->matrix, obmat, NULL, NULL, NULL, NULL, NULL, NULL); mul_m4_m4m4(cob->matrix, ct->matrix, obmat);
/* un-apply scaling caused by path */ /* un-apply scaling caused by path */
if ((data->followflag & FOLLOWPATH_RADIUS) == 0) { /* XXX - assume that scale correction means that radius will have some scale error in it - Campbell */ if ((data->followflag & FOLLOWPATH_RADIUS) == 0) { /* XXX - assume that scale correction means that radius will have some scale error in it - Campbell */
@ -3122,7 +3122,7 @@ static void clampto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *tar
unit_m4(totmat); unit_m4(totmat);
copy_v3_v3(totmat[3], vec); copy_v3_v3(totmat[3], vec);
mul_serie_m4(targetMatrix, ct->tar->obmat, totmat, NULL, NULL, NULL, NULL, NULL, NULL); mul_m4_m4m4(targetMatrix, ct->tar->obmat, totmat);
} }
} }

15
source/blender/blenkernel/intern/object.c
View File

@ -2038,15 +2038,13 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[4
} }
} }
if (ok) mul_serie_m4(totmat, par->obmat, tmat, if (ok) mul_m4_m4m4(totmat, par->obmat, tmat);
NULL, NULL, NULL, NULL, NULL, NULL);
else copy_m4_m4(totmat, par->obmat); else copy_m4_m4(totmat, par->obmat);
break; break;
case PARBONE: case PARBONE:
ob_parbone(ob, par, tmat); ob_parbone(ob, par, tmat);
mul_serie_m4(totmat, par->obmat, tmat, mul_m4_m4m4(totmat, par->obmat, tmat);
NULL, NULL, NULL, NULL, NULL, NULL);
break; break;
case PARVERT1: case PARVERT1:
@ -2062,8 +2060,7 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[4
case PARVERT3: case PARVERT3:
ob_parvert3(ob, par, tmat); ob_parvert3(ob, par, tmat);
mul_serie_m4(totmat, par->obmat, tmat, mul_m4_m4m4(totmat, par->obmat, tmat);
NULL, NULL, NULL, NULL, NULL, NULL);
break; break;
case PARSKEL: case PARSKEL:
@ -2072,10 +2069,8 @@ static void solve_parenting(Scene *scene, Object *ob, Object *par, float obmat[4
} }
/* total */ /* total */
mul_serie_m4(tmat, totmat, ob->parentinv, mul_m4_m4m4(tmat, totmat, ob->parentinv);
NULL, NULL, NULL, NULL, NULL, NULL); mul_m4_m4m4(obmat, tmat, locmat);
mul_serie_m4(obmat, tmat, locmat,
NULL, NULL, NULL, NULL, NULL, NULL);
if (simul) { if (simul) {

2
source/blender/blenkernel/intern/shrinkwrap.c
View File

@ -86,7 +86,7 @@ void space_transform_from_matrixs(SpaceTransform *data, float local[4][4], float
{ {
float itarget[4][4]; float itarget[4][4];
invert_m4_m4(itarget, target); invert_m4_m4(itarget, target);
mul_serie_m4(data->local2target, itarget, local, NULL, NULL, NULL, NULL, NULL, NULL); mul_m4_m4m4(data->local2target, itarget, local);
invert_m4_m4(data->target2local, data->local2target); invert_m4_m4(data->target2local, data->local2target);
} }

4
source/blender/editors/object/object_hook.c
View File

@ -713,11 +713,11 @@ static int object_hook_reset_exec(bContext *C, wmOperator *op)
mul_m4_m4m4(mat, hmd->object->obmat, pchan->pose_mat); mul_m4_m4m4(mat, hmd->object->obmat, pchan->pose_mat);
invert_m4_m4(imat, mat); invert_m4_m4(imat, mat);
mul_serie_m4(hmd->parentinv, imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL); mul_m4_m4m4(hmd->parentinv, imat, ob->obmat);
} }
else { else {
invert_m4_m4(hmd->object->imat, hmd->object->obmat); invert_m4_m4(hmd->object->imat, hmd->object->obmat);
mul_serie_m4(hmd->parentinv, hmd->object->imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL); mul_m4_m4m4(hmd->parentinv, hmd->object->imat, ob->obmat);
} }
} }

4
source/blender/render/intern/source/envmap.c
View File

@ -245,9 +245,7 @@ static void envmap_transmatrix(float mat[4][4], int part)
copy_m4_m4(tmat, mat); copy_m4_m4(tmat, mat);
eul_to_mat4(rotmat, eul); eul_to_mat4(rotmat, eul);
mul_serie_m4(mat, tmat, rotmat, mul_m4_m4m4(mat, tmat, rotmat);
NULL, NULL, NULL,
NULL, NULL, NULL);
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */