diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 08:14:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 08:14:12 +0400 |
| commit | 4bd0a2ba2dadee66d52f9a1101ee918f1327eec4 (patch) | |
| tree | b567b077039e78467e21548c5e03fa8b94fc2b6c /source/blender/editors/armature/editarmature_sketch.c | |
| parent | 471a86bf9ccae23b63cb1a05c9525ef99987581d (diff) | |
replace VECCOPY -> copy_v3_v3, added copy_v*_v*_short too for typesafe copying, some parts of the code are copying float -> short normals without scaling. fix coming next.
Diffstat (limited to 'source/blender/editors/armature/editarmature_sketch.c')
| -rw-r--r-- | source/blender/editors/armature/editarmature_sketch.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index 97f85b92b32..bcd9d746a44 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -409,10 +409,10 @@ static ReebNode *sk_pointToNode(SK_Point *pt, float imat[][4], float tmat[][3]) ReebNode *node; node = MEM_callocN(sizeof(ReebNode), "reeb node"); - VECCOPY(node->p, pt->p); + copy_v3_v3(node->p, pt->p); mul_m4_v3(imat, node->p); - VECCOPY(node->no, pt->no); + copy_v3_v3(node->no, pt->no); mul_m3_v3(tmat, node->no); return node; @@ -432,10 +432,10 @@ static ReebArc *sk_strokeToArc(SK_Stroke *stk, float imat[][4], float tmat[][3]) for (i = 0; i < arc->bcount; i++) { - VECCOPY(arc->buckets[i].p, stk->points[i + 1].p); + copy_v3_v3(arc->buckets[i].p, stk->points[i + 1].p); mul_m4_v3(imat, arc->buckets[i].p); - VECCOPY(arc->buckets[i].no, stk->points[i + 1].no); + copy_v3_v3(arc->buckets[i].no, stk->points[i + 1].no); mul_m3_v3(tmat, arc->buckets[i].no); } @@ -1802,8 +1802,8 @@ void sk_applyCutGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSED pt.type = PT_EXACT; pt.mode = PT_PROJECT; /* take mode from neighbouring points */ - VECCOPY(pt.p, isect->p); - VECCOPY(pt.no, isect->stroke->points[isect->before].no); + copy_v3_v3(pt.p, isect->p); + copy_v3_v3(pt.no, isect->stroke->points[isect->before].no); sk_insertStrokePoint(isect->stroke, &pt, isect->after); } @@ -1844,8 +1844,8 @@ void sk_applyTrimGesture(bContext *UNUSED(C), SK_Gesture *gest, SK_Sketch *UNUSE pt.type = PT_EXACT; pt.mode = PT_PROJECT; /* take mode from neighbouring points */ - VECCOPY(pt.p, isect->p); - VECCOPY(pt.no, isect->stroke->points[isect->before].no); + copy_v3_v3(pt.p, isect->p); + copy_v3_v3(pt.no, isect->stroke->points[isect->before].no); sub_v3_v3v3(stroke_dir, isect->stroke->points[isect->after].p, isect->stroke->points[isect->before].p); |