[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34014] trunk/blender/source/blender/ editors/uvedit/uvedit_unwrap_ops.c: Fix #25456: using Live Unwrap always unwraps with method Angle Based.

[Brecht Van Lommel]

Revision: 34014
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34014
Author:   blendix
Date:     2011-01-02 22:13:28 +0100 (Sun, 02 Jan 2011)

Log Message:
-----------
Fix #25456: using Live Unwrap always unwraps with method Angle Based.

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

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2011-01-02 19:46:32 UTC (rev 34013)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2011-01-02 21:13:28 UTC (rev 34014)
@@ -496,7 +496,7 @@
 void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit)
 {
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
-	short abf = scene->toolsettings->unwrapper == 1;
+	short abf = scene->toolsettings->unwrapper == 0;
 	short fillholes = scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES;
 
 	if(!ED_uvedit_test(obedit)) {
@@ -822,6 +822,9 @@
 		return OPERATOR_CANCELLED;
 	}
 
+	/* remember last method for live unwrap */
+	scene->toolsettings->unwrapper = method;
+
 	handle= construct_param_handle(scene, em, 0, fill_holes, 1, correct_aspect);
 
 	param_lscm_begin(handle, PARAM_FALSE, method == 0);