diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
| commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
| tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /source/blender/editors/uvedit/uvedit_parametrizer.c | |
| parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
| parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) | |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_parametrizer.c')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index dbc04f85497..259b7a95492 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -3190,11 +3190,11 @@ static float p_face_stretch(PFace *f) copy_v3_v3(tmp, v2->co); mul_v3_fl(tmp, (v3->uv[1] - v1->uv[1])); - add_v3_v3v3(Ps, Ps, tmp); + add_v3_v3(Ps, tmp); copy_v3_v3(tmp, v3->co); mul_v3_fl(tmp, (v1->uv[1] - v2->uv[1])); - add_v3_v3v3(Ps, Ps, tmp); + add_v3_v3(Ps, tmp); mul_v3_fl(Ps, w); @@ -3203,11 +3203,11 @@ static float p_face_stretch(PFace *f) copy_v3_v3(tmp, v2->co); mul_v3_fl(tmp, (v1->uv[0] - v3->uv[0])); - add_v3_v3v3(Pt, Pt, tmp); + add_v3_v3(Pt, tmp); copy_v3_v3(tmp, v3->co); mul_v3_fl(tmp, (v2->uv[0] - v1->uv[0])); - add_v3_v3v3(Pt, Pt, tmp); + add_v3_v3(Pt, tmp); mul_v3_fl(Pt, w); @@ -4027,7 +4027,7 @@ static void p_smooth(PChart *chart) MEM_freeN(nodesx); MEM_freeN(nodesy); - arena = BLI_memarena_new(1<<16); + arena = BLI_memarena_new(1<<16, "param smooth arena"); root = p_node_new(arena, tri, esize*2, minv, maxv, 0); for (v=chart->verts; v; v=v->nextlink) @@ -4047,7 +4047,7 @@ ParamHandle *param_construct_begin() PHandle *handle = MEM_callocN(sizeof*handle, "PHandle"); handle->construction_chart = p_chart_new(handle); handle->state = PHANDLE_STATE_ALLOCATED; - handle->arena = BLI_memarena_new((1<<16)); + handle->arena = BLI_memarena_new((1<<16), "param construct arena"); handle->aspx = 1.0f; handle->aspy = 1.0f; |