diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-07-21 12:55:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-21 12:57:35 +0400 |
| commit | 8489b94e07f9e73bd3c9c3e4f6a91f1f0a259827 (patch) | |
| tree | c19fb4ce9919c44876fee88c143ead4722603ca5 /source/blender/blenkernel/intern/texture.c | |
| parent | 1fdaf5862feab049d6e8e60cd5f1469a17b9cda5 (diff) | |
Math Lib: rename mul_serie_m3 to mul_m3_series & reorder args
Importantly, reversed mul_serie_m3 argument order (so it matches the m4 function)
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 84da03c7fe2..105065e85cf 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -145,12 +145,12 @@ void init_tex_mapping(TexMapping *texmap) if (texmap->type == TEXMAP_TYPE_TEXTURE) { /* to transform a texture, the inverse transform needs * to be applied to the texture coordinate */ - mul_serie_m4(texmap->mat, tmat, rmat, smat); + mul_m4_series(texmap->mat, tmat, rmat, smat); invert_m4(texmap->mat); } else if (texmap->type == TEXMAP_TYPE_POINT) { /* forward transform */ - mul_serie_m4(texmap->mat, tmat, rmat, smat); + mul_m4_series(texmap->mat, tmat, rmat, smat); } else if (texmap->type == TEXMAP_TYPE_VECTOR) { /* no translation for vectors */ |