Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-05-18 19:20:45 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-05-18 19:20:45 +0400
commite499df7b390e9f7ef6b2052e98c32043a81ce47f (patch)
treecd2b2042075489a87e07de26788cb5c4a42fcf49 /source/blender/editors
parentd2895f0a598c0e79a61f682544de988b981e2879 (diff)
Fix #31504: uv unwrap incorrectly scaling pinned islands.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/uvedit/uvedit_parametrizer.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index d596c553f7e..4a6de737e7a 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -4457,6 +4457,9 @@ void param_average(ParamHandle *handle)
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 @@ void param_average(ParamHandle *handle)
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;