Bugfix for a recent commit: live unwrapping behaved badly because

pinned uv charts were being auto rotated, they should just stay fixed.

diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c
index 990491a96d8b3eed1e79c98320daff090fe5446f..040d1e2757ff3e075c76c50cdd06876d959ff953 100644 (file)
--- 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 22acc2102627602bca9baf435d2a36d949738236..c3b31613dd9e4a7bf2bc2db33bc732e1392074fe 100644 (file)
--- 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))