diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-10-30 14:13:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-30 14:15:14 +0300 |
| commit | c2dc51d8271bc91586ef3c731c3cd7382456d482 (patch) | |
| tree | 0f36251263eb41d779cdcd027f3588a03da6110e /source/blender/render | |
| parent | 4ff87446690edd15e49d5f8610db150428690a98 (diff) | |
Math Lib: add transpose_m3_m3, m3_m4, m4_m4
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index ef1478235d8..aefb2b7b0e8 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1427,8 +1427,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem /* 2.5 setup matrices */ 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); + transpose_m3_m4(nmat, ob->imat); if (psys->flag & PSYS_USE_IMAT) { /* psys->imat is the original emitter's inverse matrix, ob->obmat is the duplicated object's matrix */ @@ -2652,8 +2651,7 @@ static void init_render_curve(Render *re, ObjectRen *obr, int timeoffset) negative_scale = is_negative_m4(mat); /* local object -> world space transform for normals */ - copy_m4_m4(nmat, mat); - transpose_m4(nmat); + transpose_m4_m4(nmat, mat); invert_m4(nmat); /* material array */ |