[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58948] trunk/blender/source/blender: replace mul_serie_m4 with mul_m4_m4m4 when only 3 args are given
Campbell Barton
ideasman42 at gmail.com
Tue Aug 6 03:45:32 CEST 2013
Revision: 58948
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58948
Author: campbellbarton
Date: 2013-08-06 01:45:29 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
replace mul_serie_m4 with mul_m4_m4m4 when only 3 args are given
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi_mjpeg.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/render/intern/source/envmap.c
Modified: trunk/blender/source/blender/avi/intern/avi_mjpeg.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi_mjpeg.c 2013-08-06 00:39:21 UTC (rev 58947)
+++ trunk/blender/source/blender/avi/intern/avi_mjpeg.c 2013-08-06 01:45:29 UTC (rev 58948)
@@ -44,8 +44,6 @@
#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 jpegmemsrcmgr_build(j_decompress_ptr dinfo, unsigned char *buffer, int bufsize);
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2013-08-06 00:39:21 UTC (rev 58947)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2013-08-06 01:45:29 UTC (rev 58948)
@@ -1227,7 +1227,7 @@
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 @@
mat4_to_size(size, cob->matrix);
/* 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 */
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 @@
unit_m4(totmat);
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);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2013-08-06 00:39:21 UTC (rev 58947)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2013-08-06 01:45:29 UTC (rev 58948)
@@ -2038,15 +2038,13 @@
}
}
- if (ok) mul_serie_m4(totmat, par->obmat, tmat,
- NULL, NULL, NULL, NULL, NULL, NULL);
+ if (ok) mul_m4_m4m4(totmat, par->obmat, tmat);
else copy_m4_m4(totmat, par->obmat);
break;
case PARBONE:
ob_parbone(ob, par, tmat);
- mul_serie_m4(totmat, par->obmat, tmat,
- NULL, NULL, NULL, NULL, NULL, NULL);
+ mul_m4_m4m4(totmat, par->obmat, tmat);
break;
case PARVERT1:
@@ -2062,8 +2060,7 @@
case PARVERT3:
ob_parvert3(ob, par, tmat);
- mul_serie_m4(totmat, par->obmat, tmat,
- NULL, NULL, NULL, NULL, NULL, NULL);
+ mul_m4_m4m4(totmat, par->obmat, tmat);
break;
case PARSKEL:
@@ -2072,10 +2069,8 @@
}
/* total */
- mul_serie_m4(tmat, totmat, ob->parentinv,
- NULL, NULL, NULL, NULL, NULL, NULL);
- mul_serie_m4(obmat, tmat, locmat,
- NULL, NULL, NULL, NULL, NULL, NULL);
+ mul_m4_m4m4(tmat, totmat, ob->parentinv);
+ mul_m4_m4m4(obmat, tmat, locmat);
if (simul) {
Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2013-08-06 00:39:21 UTC (rev 58947)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2013-08-06 01:45:29 UTC (rev 58948)
@@ -86,7 +86,7 @@
{
float itarget[4][4];
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);
}
Modified: trunk/blender/source/blender/editors/object/object_hook.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_hook.c 2013-08-06 00:39:21 UTC (rev 58947)
+++ trunk/blender/source/blender/editors/object/object_hook.c 2013-08-06 01:45:29 UTC (rev 58948)
@@ -713,11 +713,11 @@
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);
+ mul_m4_m4m4(hmd->parentinv, imat, ob->obmat);
}
else {
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);
}
}
Modified: trunk/blender/source/blender/render/intern/source/envmap.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/envmap.c 2013-08-06 00:39:21 UTC (rev 58947)
+++ trunk/blender/source/blender/render/intern/source/envmap.c 2013-08-06 01:45:29 UTC (rev 58948)
@@ -245,9 +245,7 @@
copy_m4_m4(tmat, mat);
eul_to_mat4(rotmat, eul);
- mul_serie_m4(mat, tmat, rotmat,
- NULL, NULL, NULL,
- NULL, NULL, NULL);
+ mul_m4_m4m4(mat, tmat, rotmat);
}
/* ------------------------------------------------------------------------- */
More information about the Bf-blender-cvs
mailing list