diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-07 11:01:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-07 11:01:24 +0400 |
| commit | 7508540c53222c289a665cb0528e2a5c984b9b99 (patch) | |
| tree | 1fd3f92c4fd7ea74d23288468a1ce494350c33a7 /source/blender/editors/sculpt_paint/paint_utils.c | |
| parent | 261c1679b484884973d485c3f21bed9e87fa5260 (diff) | |
| parent | 4b3cc63f73cfe519689bdbd8482e655b72423038 (diff) | |
svn merge -r41575:41602 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_utils.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 5ac72d71109..f79ccbb9a55 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -124,7 +124,7 @@ float paint_get_tex_pixel(Brush* br, float u, float v) static void imapaint_project(Object *ob, float *model, float *proj, float *co, float *pco) { - VECCOPY(pco, co); + copy_v3_v3(pco, co); pco[3]= 1.0f; mul_m4_v3(ob->obmat, pco); @@ -166,7 +166,7 @@ static void imapaint_tri_weights(Object *ob, float *v1, float *v2, float *v3, fl invert_m3_m3(invwmat, wmat); mul_m3_v3(invwmat, h); - VECCOPY(w, h); + copy_v3_v3(w, h); /* w is still divided by perspdiv, make it sum to one */ divw= w[0] + w[1] + w[2]; |