Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-12-17 07:46:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-17 07:46:38 +0400
commit84236c2502e83f6622ede35d18b3a0df94bb54ab (patch)
tree83020c9fa170924d0c01e2b9a53a9f78b69bb9d1 /source/blender/blenkernel/intern/anim.c
parent994f4bb3f78a467b6c34e30a9b8868fc4d01caf0 (diff)
use 2d copy functions with UV's in more places.
Diffstat (limited to 'source/blender/blenkernel/intern/anim.c')
-rw-r--r--source/blender/blenkernel/intern/anim.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index bb8022c59fe..89bad72044e 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -1143,21 +1143,17 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa
madd_v3_v3v3fl(dob->orco, dob->orco, orco[mv1], w);
madd_v3_v3v3fl(dob->orco, dob->orco, orco[mv2], w);
madd_v3_v3v3fl(dob->orco, dob->orco, orco[mv3], w);
- if(mv4)
+ if (mv4) {
madd_v3_v3v3fl(dob->orco, dob->orco, orco[mv4], w);
+ }
}
if(mtface) {
- dob->uv[0] += w*mtface[a].uv[0][0];
- dob->uv[1] += w*mtface[a].uv[0][1];
- dob->uv[0] += w*mtface[a].uv[1][0];
- dob->uv[1] += w*mtface[a].uv[1][1];
- dob->uv[0] += w*mtface[a].uv[2][0];
- dob->uv[1] += w*mtface[a].uv[2][1];
-
- if(mv4) {
- dob->uv[0] += w*mtface[a].uv[3][0];
- dob->uv[1] += w*mtface[a].uv[3][1];
+ madd_v2_v2v2fl(dob->uv, dob->uv, mtface[a].uv[0], w);
+ madd_v2_v2v2fl(dob->uv, dob->uv, mtface[a].uv[1], w);
+ madd_v2_v2v2fl(dob->uv, dob->uv, mtface[a].uv[2], w);
+ if (mv4) {
+ madd_v2_v2v2fl(dob->uv, dob->uv, mtface[a].uv[3], w);
}
}
}