From 9b4adf76e3f9d1d4b09e5b010c19f400905616ee Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 2 Jan 2011 21:13:28 +0000 Subject: [PATCH] Fix #25456: using Live Unwrap always unwraps with method Angle Based. --- source/blender/editors/uvedit/uvedit_unwrap_ops.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 5136c50a16b..14c16798dea 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -496,7 +496,7 @@ static ParamHandle *liveHandle = NULL; 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 @@ static int unwrap_exec(bContext *C, wmOperator *op) 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);