diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
commit | db6cb30941da7899ccafa44c87c17970d134a2c9 (patch) | |
tree | 0f1c3df62346cfac61e2785e9ec7ac8e0e30f443 /source/blender/modifiers/intern/MOD_uvproject.c | |
parent | e5b1f9c28d52254fd11e226ed4ac7bf07d7259d7 (diff) | |
parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) |
svn merge ^/trunk/blender -r42669:42670
Diffstat (limited to 'source/blender/modifiers/intern/MOD_uvproject.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_uvproject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 18f39fa6c2f..bd82001dd1b 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -222,11 +222,11 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, if(cam->type == CAM_PERSP) { float perspmat[4][4]; perspective_m4( perspmat,xmin, xmax, ymin, ymax, cam->clipsta, cam->clipend); - mul_m4_m4m4(tmpmat, projectors[i].projmat, perspmat); + mult_m4_m4m4(tmpmat, perspmat, projectors[i].projmat); } else { /* if(cam->type == CAM_ORTHO) */ float orthomat[4][4]; orthographic_m4( orthomat,xmin, xmax, ymin, ymax, cam->clipsta, cam->clipend); - mul_m4_m4m4(tmpmat, projectors[i].projmat, orthomat); + mult_m4_m4m4(tmpmat, orthomat, projectors[i].projmat); } } } else { @@ -250,7 +250,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, } } - mul_m4_m4m4(projectors[i].projmat, tmpmat, offsetmat); + mult_m4_m4m4(projectors[i].projmat, offsetmat, tmpmat); /* calculate worldspace projector normal (for best projector test) */ projectors[i].normal[0] = 0; |