diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-21 01:28:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-21 01:28:57 +0400 |
| commit | cceef0d44fbbec3ee300d7e3cc01d5eab19a36c8 (patch) | |
| tree | 60d77967ad545477b17938d2ac3ab5ad3798b044 /source/blender/modifiers/intern/MOD_uvproject.c | |
| parent | 57ed2fd1c11d6c23300175ffcbeb06f8675d55b2 (diff) | |
| parent | b70174cb9350868e9dd26139a8980406b18415b8 (diff) | |
svn merge ^/trunk/blender -r42759:42761
Diffstat (limited to 'source/blender/modifiers/intern/MOD_uvproject.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_uvproject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 8f2d248b956..bcbb0ab82e8 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -291,7 +291,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, project_from_camera(tface->uv[0], coords[mf->v1], projectors[0].uci); project_from_camera(tface->uv[1], coords[mf->v2], projectors[0].uci); project_from_camera(tface->uv[2], coords[mf->v3], projectors[0].uci); - if(mf->v3) + if(mf->v4) project_from_camera(tface->uv[3], coords[mf->v4], projectors[0].uci); } else { @@ -344,7 +344,7 @@ static DerivedMesh *uvprojectModifier_do(UVProjectModifierData *umd, project_from_camera(tface->uv[0], coords[mf->v1], best_projector->uci); project_from_camera(tface->uv[1], coords[mf->v2], best_projector->uci); project_from_camera(tface->uv[2], coords[mf->v3], best_projector->uci); - if(mf->v3) + if(mf->v4) project_from_camera(tface->uv[3], coords[mf->v4], best_projector->uci); } else { |