diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-08-05 06:34:54 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-08-05 06:34:54 +0400 |
| commit | 012b419549d1093f2c35436b588cf07da1708945 (patch) | |
| tree | 9b5e5fdc6fb69ff8bf7f1af60cf1419118fc48dd /source/blender/editors/uvedit | |
| parent | 4936ec8afc9b75ae916be38e14c85fa9f3a003c7 (diff) | |
select linked has been bmeshafied, yay
Diffstat (limited to 'source/blender/editors/uvedit')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_unwrap_ops.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 0219d8dc774..f2d2d3edb8d 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -628,7 +628,8 @@ static void find_nearest_uv_face(Scene *scene, Image *ima, BMEditMesh *em, float /*this will fill in hit.vert1 and hit.vert2*/ find_nearest_uv_edge(scene, ima, em, co, hit); - hit->l = hit->nextl = hit->luv = hit->nextluv = NULL; + hit->l = hit->nextl = NULL; + hit->luv = hit->nextluv = NULL; BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) { tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY); @@ -715,7 +716,8 @@ static void find_nearest_uv_vert(Scene *scene, Image *ima, BMEditMesh *em, /*this will fill in hit.vert1 and hit.vert2*/ find_nearest_uv_edge(scene, ima, em, co, hit); - hit->l = hit->nextl = hit->luv = hit->nextluv = NULL; + hit->l = hit->nextl = NULL; + hit->luv = hit->nextluv = NULL; mindist= 1e10f; memset(hit, 0, sizeof(*hit)); diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index ef882e44b0d..53eceb4d342 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -105,7 +105,9 @@ static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit) /****************** Parametrizer Conversion ***************/ -ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, short implicit, short fill, short sel, short correct_aspect) +ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, + short implicit, short fill, short sel, + short correct_aspect) { ParamHandle *handle; BMFace *efa; @@ -510,7 +512,7 @@ void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit) return; } - liveHandle = construct_param_handle(scene, em, 0, fillholes, 1, 1); + liveHandle = construct_param_handle(scene, em, 0, fillholes, 0, 1); param_lscm_begin(liveHandle, PARAM_TRUE, abf); } @@ -824,7 +826,7 @@ static int unwrap_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - handle= construct_param_handle(scene, em, 0, fill_holes, 1, correct_aspect); + handle= construct_param_handle(scene, em, 0, fill_holes, 0, correct_aspect); param_lscm_begin(handle, PARAM_FALSE, method == 0); param_lscm_solve(handle); |