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/render | |
| 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/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 1d7a155b108..c6ebe44c5da 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4546,7 +4546,7 @@ static void set_dupli_tex_mat(Render *re, ObjectInstanceRen *obi, DupliObject *d obi->duplitexmat= BLI_memarena_alloc(re->memArena, sizeof(float)*4*4); invert_m4_m4(imat, dob->mat); - mul_serie_m4(obi->duplitexmat, re->viewmat, omat, imat, re->viewinv); + mul_m4_series(obi->duplitexmat, re->viewmat, omat, imat, re->viewinv); } copy_v3_v3(obi->dupliorco, dob->orco); |