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/blenkernel/intern/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/blenkernel/intern/sketch.c')
-rw-r--r-- | source/blender/blenkernel/intern/sketch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/sketch.c b/source/blender/blenkernel/intern/sketch.c index 4cc5a880625..432dc9ec609 100644 --- a/source/blender/blenkernel/intern/sketch.c +++ b/source/blender/blenkernel/intern/sketch.c @@ -245,13 +245,13 @@ void sk_straightenStroke(SK_Stroke *stk, int start, int end, float p_start[3], f prev = stk->points + start; next = stk->points + end; - VECCOPY(pt1.p, p_start); - VECCOPY(pt1.no, prev->no); + copy_v3_v3(pt1.p, p_start); + copy_v3_v3(pt1.no, prev->no); pt1.mode = prev->mode; pt1.type = prev->type; - VECCOPY(pt2.p, p_end); - VECCOPY(pt2.no, next->no); + copy_v3_v3(pt2.p, p_end); + copy_v3_v3(pt2.no, next->no); pt2.mode = next->mode; pt2.type = next->type; @@ -323,7 +323,7 @@ void sk_flattenStroke(SK_Stroke *stk, int start, int end) total = end - start + 1; - VECCOPY(normal, stk->points[start].no); + copy_v3_v3(normal, stk->points[start].no); sub_v3_v3v3(distance, stk->points[end].p, stk->points[start].p); project_v3_v3v3(normal, distance, normal); |