[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46782] trunk/blender/source/blender/ editors/uvedit/uvedit_parametrizer.c: Fix #31504: uv unwrap incorrectly scaling pinned islands.

[Brecht Van Lommel]

Revision: 46782
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46782
Author:   blendix
Date:     2012-05-18 15:20:45 +0000 (Fri, 18 May 2012)
Log Message:
-----------
Fix #31504: uv unwrap incorrectly scaling pinned islands.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2012-05-18 15:06:26 UTC (rev 46781)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2012-05-18 15:20:45 UTC (rev 46782)
@@ -4457,6 +4457,9 @@
 	for (i = 0; i < phandle->ncharts; i++) {
 		PFace *f;
 		chart = phandle->charts[i];
+
+		if (chart->flag & PCHART_NOPACK)
+			continue;
 		
 		chart->u.pack.area = 0.0f; /* 3d area */
 		chart->u.pack.rescale = 0.0f; /* UV area, abusing rescale for tmp storage, oh well :/ */
@@ -4479,6 +4482,10 @@
 	
 	for (i = 0; i < phandle->ncharts; i++) {
 		chart = phandle->charts[i];
+
+		if (chart->flag & PCHART_NOPACK)
+			continue;
+	
 		if (chart->u.pack.area != 0.0f && chart->u.pack.rescale != 0.0f) {
 			fac = chart->u.pack.area / chart->u.pack.rescale;