diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-09-27 23:45:38 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-09-27 23:45:38 +0400 |
| commit | 9dce6081c0b46e3da1f78a0fd336bafd13ec2f04 (patch) | |
| tree | 232ae840163b55cf498f08f5e133212267f53508 /source | |
| parent | 0cd7ee76a43316255e12ec27f615ad9916334eee (diff) | |
Bugfix for a recent commit: live unwrapping behaved badly because
pinned uv charts were being auto rotated, they should just stay fixed.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/header_image.c | 4 | ||||
| -rw-r--r-- | source/blender/src/parametrizer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 990491a96d8..040d1e2757f 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -901,7 +901,7 @@ void image_buttons(void) uiDefPulldownBut(block, image_viewmenu, NULL, "View", xco, -2, xmax-3, 24, ""); xco+= xmax; - if((G.f & G_FACESELECT) && !(G.sima->flag & SI_DRAWTOOL)) { + if((G.f & G_FACESELECT) && !(ima && (G.sima->flag & SI_DRAWTOOL))) { xmax= GetButStringLength("Select"); uiDefPulldownBut(block, image_selectmenu, NULL, "Select", xco, -2, xmax-3, 24, ""); xco+= xmax; @@ -915,7 +915,7 @@ void image_buttons(void) uiDefPulldownBut(block, image_imagemenu, NULL, menuname, xco, -2, xmax-3, 24, ""); xco+= xmax; - if((G.f & G_FACESELECT) && !(G.sima->flag & SI_DRAWTOOL)) { + if((G.f & G_FACESELECT) && !(ima && (G.sima->flag & SI_DRAWTOOL))) { xmax= GetButStringLength("UVs"); uiDefPulldownBut(block, image_uvsmenu, NULL, "UVs", xco, -2, xmax-3, 24, ""); xco+= xmax; diff --git a/source/blender/src/parametrizer.c b/source/blender/src/parametrizer.c index 22acc210262..c3b31613dd9 100644 --- a/source/blender/src/parametrizer.c +++ b/source/blender/src/parametrizer.c @@ -4137,7 +4137,7 @@ void param_lscm_solve(ParamHandle *handle) if (chart->u.lscm.context) { result = p_chart_lscm_solve(chart); - if (result) + if (result && !(chart->flag & PCHART_NOPACK)) p_chart_rotate_minimum_area(chart); if (!result || (chart->u.lscm.pin1)) |