diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-27 22:35:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-27 22:35:27 +0300 |
| commit | 35f094f20987d000357d88d99738a5e429b63dcb (patch) | |
| tree | da1f6eede9ae5a6f7e6ddda7f1af6c02f162586c /source/blender/src/editsima.c | |
| parent | 780ea713d59423ef9679ff131f53f00a97a82410 (diff) | |
Fix for bug #8380: snapping in the uv editor didn't work with
non-square images.
Fix for uv limit stitch, was broken since editmode integration.
Diffstat (limited to 'source/blender/src/editsima.c')
| -rw-r--r-- | source/blender/src/editsima.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c index 66123f58596..e92e4531612 100644 --- a/source/blender/src/editsima.c +++ b/source/blender/src/editsima.c @@ -1314,7 +1314,7 @@ void stitch_limit_uv_tface(void) { MTFace *tf; int a, vtot; - float newuv[2], limit[2]; + float newuv[2], limit[2], pixellimit; UvMapVert *vlist, *iterv; EditMesh *em = G.editMesh; EditVert *ev; @@ -1330,20 +1330,23 @@ void stitch_limit_uv_tface(void) return; } - limit[0]= limit[1]= 20.0; - add_numbut(0, NUM|FLO, "Limit:", 0.1, 1000.0, &limit[0], NULL); + pixellimit= 20.0f; + add_numbut(0, NUM|FLO, "Limit:", 0.1, 1000.0, &pixellimit, NULL); if (!do_clever_numbuts("Stitch UVs", 1, REDRAW)) return; - limit[0]= limit[1]= limit[0]/256.0; if(G.sima->image) { ImBuf *ibuf= imagewindow_get_ibuf(G.sima); if(ibuf && ibuf->x > 0 && ibuf->y > 0) { - limit[1]= limit[0]/(float)ibuf->y; - limit[0]= limit[0]/(float)ibuf->x; + limit[0]= pixellimit/(float)ibuf->x; + limit[1]= pixellimit/(float)ibuf->y; } + else + limit[0]= limit[1]= pixellimit/256.0; } + else + limit[0]= limit[1]= pixellimit/256.0; /*vmap= make_uv_vert_map(me->mface, tf, me->totface, me->totvert, 1, limit);*/ EM_init_index_arrays(0, 0, 1); @@ -1364,7 +1367,7 @@ void stitch_limit_uv_tface(void) efa = EM_get_face_for_index(iterv->f); tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE); - if (tf[iterv->f].flag & TF_SEL_MASK(iterv->tfindex)) { + if (tf->flag & TF_SEL_MASK(iterv->tfindex)) { newuv[0] += tf->uv[iterv->tfindex][0]; newuv[1] += tf->uv[iterv->tfindex][1]; vtot++; |