diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 20:52:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 20:52:10 +0400 |
commit | 88f4087a574c2f74b3414d47dab8be97cce4bc84 (patch) | |
tree | f1440d4aa18d73c4d1449857ccabefc444d867e2 /source/blender/modifiers/intern/MOD_uvproject.c | |
parent | 4514be8f4ff5c87824e447c7016939363f66f78c (diff) | |
parent | 259582235c5dc211f998e2c1924faae6c9b7a87e (diff) |
svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/modifiers/intern/MOD_uvproject.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_uvproject.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 6be1002bb00..afa914e869c 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -271,7 +271,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, /* if only one projector, project coords to UVs */ if(num_projectors == 1 && projectors[0].uci==NULL) for(i = 0, co = coords; i < numVerts; ++i, ++co) - mul_project_m4_v4(projectors[0].projmat, *co); + mul_project_m4_v3(projectors[0].projmat, *co); mface = dm->getTessFaceArray(dm); numFaces = dm->getNumTessFaces(dm); @@ -345,11 +345,11 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, project_from_camera(tface->uv[3], coords[mf->v4], best_projector->uci); } else { - mul_project_m4_v4(best_projector->projmat, co1); - mul_project_m4_v4(best_projector->projmat, co2); - mul_project_m4_v4(best_projector->projmat, co3); + mul_project_m4_v3(best_projector->projmat, co1); + mul_project_m4_v3(best_projector->projmat, co2); + mul_project_m4_v3(best_projector->projmat, co3); if(mf->v4) - mul_project_m4_v4(best_projector->projmat, co4); + mul_project_m4_v3(best_projector->projmat, co4); /* apply transformed coords as UVs */ tface->uv[0][0] = co1[0]; |