[Bf-blender-cvs] [c9b3e34b9a8] uv_unwrapping_slim_algorithm: UV Unwrapping SLIM: minimize_stretch now only affects selected vertices. RESPECTS user defined pins!

[Aurel Gruber]

Commit: c9b3e34b9a8a519f4b924ff173902d8c5e018e35
Author: Aurel Gruber
Date:   Thu Mar 9 21:55:35 2017 +0100
Branches: uv_unwrapping_slim_algorithm
https://developer.blender.org/rBc9b3e34b9a8a519f4b924ff173902d8c5e018e35

UV Unwrapping SLIM: minimize_stretch now only affects selected vertices. RESPECTS user defined pins!

===================================================================

M	intern/slim/intern/slim_parametrizer.cpp
M	source/blender/editors/uvedit/uvedit_parametrizer.c

===================================================================

diff --git a/intern/slim/intern/slim_parametrizer.cpp b/intern/slim/intern/slim_parametrizer.cpp
index 7e9fe12edb2..5182b7850ef 100644
--- a/intern/slim/intern/slim_parametrizer.cpp
+++ b/intern/slim/intern/slim_parametrizer.cpp
@@ -78,7 +78,6 @@ Eigen::MatrixXd getInteractiveResultBlendedWithOriginal(float blend, SLIMData *s
 void param_slim_single_iteration(SLIMData *slimData){
 	int numberOfIterations = 1;
 	slim_solve(*slimData, numberOfIterations);
-	
 }
 
 void param_slim(SLIMMatrixTransfer *mt, int nIterations, bool borderVerticesArePinned, bool skipInitialization){
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c
index 4133788aa2b..b4a891e9011 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -5039,7 +5039,7 @@ void transfer_vertices(const int chartNr, const PHandle *phandle, SLIMMatrixTran
 		UV[v->slimId] = v->uv[0];
 		UV[r + v->slimId] = v->uv[1];
 
-		if (v->flag & PVERT_PIN){
+		if (v->flag & PVERT_PIN || !(v->flag & PVERT_SELECT)){
 			mt->pinned_vertices = true;
 			mt->n_pinned_vertices[chartNr] += 1;