sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-01-02 21:13:28 +00:00
parent 05cfe50436
commit 9b4adf76e3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/uvedit/uvedit_unwrap_ops.c
View File

@ -496,7 +496,7 @@ static ParamHandle *liveHandle = NULL;
void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit) void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit)
{ {
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data); 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; short fillholes = scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES;
if(!ED_uvedit_test(obedit)) { if(!ED_uvedit_test(obedit)) {
@ -822,6 +822,9 @@ static int unwrap_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED; 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); handle= construct_param_handle(scene, em, 0, fill_holes, 1, correct_aspect);
param_lscm_begin(handle, PARAM_FALSE, method == 0); param_lscm_begin(handle, PARAM_FALSE, method == 0);