Fix T59972: UV live unwrap does not pack islands.

Packing was not being called after multi-object editing changes. Includes code
refactoring to make function parameters more clear.

4 files changed, 170 insertions, 109 deletions

diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h
index 3cc285a53de..b17fea2b299 100644
--- a/source/blender/editors/include/ED_uvedit.h
+++ b/source/blender/editors/include/ED_uvedit.h
@@ -127,12 +127,9 @@ void ED_uvedit_live_unwrap_begin(struct Scene *scene, struct Object *obedit);
 void ED_uvedit_live_unwrap_re_solve(void);
 void ED_uvedit_live_unwrap_end(short cancel);
 
-void ED_uvedit_live_unwrap(struct Scene *scene, struct Object *obedit);
+void ED_uvedit_live_unwrap(struct Scene *scene, struct Object **objects, int objects_len);
 void ED_uvedit_add_simple_uvs(struct Main *bmain, struct Scene *scene, struct Object *ob);
 
-/* single call up unwrap using scene settings, used for edge tag unwrapping */
-void ED_unwrap_lscm(struct Scene *scene, struct Object *obedit, const short sel, const bool pack);
-
 
 /* uvedit_draw.c */
 void ED_image_draw_cursor(
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index b8dd46f3cc3..af227ff0eb9 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -1006,10 +1006,16 @@ static int edbm_mark_seam_exec(bContext *C, wmOperator *op)
 				BM_elem_flag_enable(eed, BM_ELEM_SEAM);
 			}
 		}
+	}
+
+	ED_uvedit_live_unwrap(scene, objects, objects_len);
 
-		ED_uvedit_live_unwrap(scene, obedit);
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 		EDBM_update_generic(em, true, false);
 	}
+
 	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index bb56f9f18b0..0a9677834e8 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -4568,6 +4568,8 @@ static int uv_mark_seam_exec(bContext *C, wmOperator *op)
 	uint objects_len = 0;
 	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, ((View3D *)NULL), &objects_len);
 
+	bool changed = false;
+
 	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
 		Object *ob = objects[ob_index];
 		Mesh *me = (Mesh *)ob->data;
@@ -4580,8 +4582,6 @@ static int uv_mark_seam_exec(bContext *C, wmOperator *op)
 
 		const int cd_loop_uv_offset = CustomData_get_offset(&bm->ldata, CD_MLOOPUV);
 
-		bool changed = false;
-
 		BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) {
 			BM_ITER_ELEM (loop, &liter, efa, BM_LOOPS_OF_FACE) {
 				if (uvedit_edge_select_test(scene, loop, cd_loop_uv_offset)) {
@@ -4592,14 +4592,15 @@ static int uv_mark_seam_exec(bContext *C, wmOperator *op)
 		}
 
 		if (changed) {
-			if (scene->toolsettings->edge_mode_live_unwrap) {
-				ED_unwrap_lscm(scene, ob, false, false);
-			}
-
 			DEG_id_tag_update(&me->id, 0);
 			WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 		}
 	}
+
+	if (changed) {
+		ED_uvedit_live_unwrap(scene, objects, objects_len);
+	}
+
 	MEM_freeN(objects);
 
 	return OPERATOR_FINISHED;
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 93ba2f62029..9316065a230 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -164,7 +164,14 @@ static bool ED_uvedit_ensure_uvs(bContext *C, Scene *UNUSED(scene), Object *obed
 
 /****************** Parametrizer Conversion ***************/
 
-static bool uvedit_have_selection(Scene *scene, BMEditMesh *em, bool implicit)
+typedef struct UnwrapOptions {
+	bool topology_from_uvs; /* Connectivity based on UV coordinates instead of seams. */
+	bool only_selected;     /* Only affect selected faces. */
+	bool fill_holes;        /* Fill holes to better preserve shape. */
+	bool correct_aspect;    /* Correct for mapped image texture aspect ratio. */
+} UnwrapOptions;
+
+static bool uvedit_have_selection(Scene *scene, BMEditMesh *em, const UnwrapOptions *options)
 {
 	BMFace *efa;
 	BMLoop *l;
@@ -190,7 +197,7 @@ static bool uvedit_have_selection(Scene *scene, BMEditMesh *em, bool implicit)
 				break;
 		}
 
-		if (implicit && !l)
+		if (options->topology_from_uvs && !l)
 			continue;
 
 		return true;
@@ -200,13 +207,14 @@ static bool uvedit_have_selection(Scene *scene, BMEditMesh *em, bool implicit)
 }
 
 static bool uvedit_have_selection_multi(
-        Scene *scene, Object **objects, const uint objects_len, bool implicit)
+        Scene *scene, Object **objects, const uint objects_len,
+        const UnwrapOptions *options)
 {
 	bool have_select = false;
 	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
 		Object *obedit = objects[ob_index];
 		BMEditMesh *em = BKE_editmesh_from_object(obedit);
-		if (uvedit_have_selection(scene, em, implicit)) {
+		if (uvedit_have_selection(scene, em, options)) {
 			have_select = true;
 			break;
 		}
@@ -268,8 +276,7 @@ static void construct_param_handle_face_add(ParamHandle *handle, Scene *scene,
 /* See: construct_param_handle_multi to handle multiple objects at once. */
 static ParamHandle *construct_param_handle(
         Scene *scene, Object *ob, BMesh *bm,
-        const bool implicit, const bool fill, const bool sel,
-        const bool correct_aspect)
+        const UnwrapOptions *options)
 {
 	ParamHandle *handle;
 	BMFace *efa;
@@ -282,7 +289,7 @@ static ParamHandle *construct_param_handle(
 
 	handle = param_construct_begin();
 
-	if (correct_aspect) {
+	if (options->correct_aspect) {
 		float aspx, aspy;
 
 		ED_uvedit_get_aspect(scene, ob, bm, &aspx, &aspy);
@@ -296,11 +303,13 @@ static ParamHandle *construct_param_handle(
 
 	BM_ITER_MESH_INDEX (efa, &iter, bm, BM_FACES_OF_MESH, i) {
 
-		if ((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) || (sel && BM_elem_flag_test(efa, BM_ELEM_SELECT) == 0)) {
+		if ((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) ||
+		    (options->only_selected && BM_elem_flag_test(efa, BM_ELEM_SELECT) == 0))
+		{
 			continue;
 		}
 
-		if (implicit) {
+		if (options->topology_from_uvs) {
 			bool is_loopsel = false;
 
 			BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -317,7 +326,7 @@ static ParamHandle *construct_param_handle(
 		construct_param_handle_face_add(handle, scene, efa, i, cd_loop_uv_offset);
 	}
 
-	if (!implicit) {
+	if (!options->topology_from_uvs) {
 		BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
 			if (BM_elem_flag_test(eed, BM_ELEM_SEAM)) {
 				ParamKey vkeys[2];
@@ -328,7 +337,7 @@ static ParamHandle *construct_param_handle(
 		}
 	}
 
-	param_construct_end(handle, fill, implicit);
+	param_construct_end(handle, options->fill_holes, options->topology_from_uvs);
 
 	return handle;
 }
@@ -338,8 +347,7 @@ static ParamHandle *construct_param_handle(
  */
 static ParamHandle *construct_param_handle_multi(
         Scene *scene, Object **objects, const uint objects_len,
-        const bool implicit, const bool fill, const bool sel,
-        const bool correct_aspect)
+        const UnwrapOptions *options)
 {
 	ParamHandle *handle;
 	BMFace *efa;
@@ -348,10 +356,9 @@ static ParamHandle *construct_param_handle_multi(
 	BMIter iter, liter;
 	int i;
 
-
 	handle = param_construct_begin();
 
-	if (correct_aspect) {
+	if (options->correct_aspect) {
 		Object *ob = objects[0];
 		BMEditMesh *em = BKE_editmesh_from_object(ob);
 		BMesh *bm = em->bm;
@@ -377,11 +384,13 @@ static ParamHandle *construct_param_handle_multi(
 
 		BM_ITER_MESH_INDEX (efa, &iter, bm, BM_FACES_OF_MESH, i) {
 
-			if ((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) || (sel && BM_elem_flag_test(efa, BM_ELEM_SELECT) == 0)) {
+			if ((BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) ||
+			    (options->only_selected && BM_elem_flag_test(efa, BM_ELEM_SELECT) == 0))
+			{
 				continue;
 			}
 
-			if (implicit) {
+			if (options->topology_from_uvs) {
 				bool is_loopsel = false;
 
 				BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
@@ -398,7 +407,7 @@ static ParamHandle *construct_param_handle_multi(
 			construct_param_handle_face_add(handle, scene, efa, i + offset, cd_loop_uv_offset);
 		}
 
-		if (!implicit) {
+		if (!options->topology_from_uvs) {
 			BM_ITER_MESH (eed, &iter, bm, BM_EDGES_OF_MESH) {
 				if (BM_elem_flag_test(eed, BM_ELEM_SEAM)) {
 					ParamKey vkeys[2];
@@ -411,7 +420,7 @@ static ParamHandle *construct_param_handle_multi(
 		offset += bm->totface;
 	}
 
-	param_construct_end(handle, fill, implicit);
+	param_construct_end(handle, options->fill_holes, options->topology_from_uvs);
 
 	return handle;
 }
@@ -444,7 +453,7 @@ static void texface_from_original_index(BMFace *efa, int index, float **uv, Para
 
 /* unwrap handle initialization for subsurf aware-unwrapper. The many modifications required to make the original function(see above)
  * work justified the existence of a new function. */
-static ParamHandle *construct_param_handle_subsurfed(Scene *scene, Object *ob, BMEditMesh *em, short fill, short sel, short correct_aspect)
+static ParamHandle *construct_param_handle_subsurfed(Scene *scene, Object *ob, BMEditMesh *em, const UnwrapOptions *options)
 {
 	ParamHandle *handle;
 	/* index pointers */
@@ -480,7 +489,7 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, Object *ob, B
 
 	handle = param_construct_begin();
 
-	if (correct_aspect) {
+	if (options->correct_aspect) {
 		float aspx, aspy;
 
 		ED_uvedit_get_aspect(scene, ob, em->bm, &aspx, &aspy);
@@ -546,8 +555,11 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, Object *ob, B
 				continue;
 		}
 		else {
-			if (BM_elem_flag_test(origFace, BM_ELEM_HIDDEN) || (sel && !BM_elem_flag_test(origFace, BM_ELEM_SELECT)))
+			if (BM_elem_flag_test(origFace, BM_ELEM_HIDDEN) ||
+			    (options->only_selected && !BM_elem_flag_test(origFace, BM_ELEM_SELECT)))
+			{
 				continue;
+			}
 		}
 
 		mloop = &subsurfedLoops[mpoly->loopstart];
@@ -585,7 +597,7 @@ static ParamHandle *construct_param_handle_subsurfed(Scene *scene, Object *ob, B
 		}
 	}
 
-	param_construct_end(handle, fill, 0);
+	param_construct_end(handle, options->fill_holes, options->topology_from_uvs);
 
 	/* cleanup */
 	MEM_freeN(faceMap);
@@ -613,26 +625,29 @@ static bool minimize_stretch_init(bContext *C, wmOperator *op)
 	Scene *scene = CTX_data_scene(C);
 	ViewLayer *view_layer = CTX_data_view_layer(C);
 
-	MinStretch *ms;
-	const bool fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
-	bool implicit = true;
+	const UnwrapOptions options = {
+		.topology_from_uvs = true,
+		.fill_holes = RNA_boolean_get(op->ptr, "fill_holes"),
+		.only_selected = true,
+		.correct_aspect = true,
+	};
 
 	uint objects_len = 0;
 	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, CTX_wm_view3d(C), &objects_len);
 
-	if (!uvedit_have_selection_multi(scene, objects, objects_len, implicit)) {
+	if (!uvedit_have_selection_multi(scene, objects, objects_len, &options)) {
 		MEM_freeN(objects);
 		return false;
 	}
 
-	ms = MEM_callocN(sizeof(MinStretch), "MinStretch");
+	MinStretch *ms = MEM_callocN(sizeof(MinStretch), "MinStretch");
 	ms->scene = scene;
 	ms->objects_edit = objects;
 	ms->objects_len = objects_len;
 	ms->blend = RNA_float_get(op->ptr, "blend");
 	ms->iterations = RNA_int_get(op->ptr, "iterations");
 	ms->i = 0;
-	ms->handle = construct_param_handle_multi(scene, objects, objects_len, implicit, fill_holes, true, true);
+	ms->handle = construct_param_handle_multi(scene, objects, objects_len, &options);
 	ms->lasttime = PIL_check_seconds_timer();
 
 	param_stretch_begin(ms->handle);
@@ -679,7 +694,7 @@ static void minimize_stretch_iteration(bContext *C, wmOperator *op, bool interac
 				continue;
 			}
 
-			DEG_id_tag_update(obedit->data, 0);
+			DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
 			WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 		}
 	}
@@ -715,7 +730,7 @@ static void minimize_stretch_exit(bContext *C, wmOperator *op, bool cancel)
 			continue;
 		}
 
-		DEG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 	}
 
@@ -838,38 +853,61 @@ void UV_OT_minimize_stretch(wmOperatorType *ot)
 
 /* ******************** Pack Islands operator **************** */
 
-
 static void uvedit_pack_islands(Scene *scene, Object *ob, BMesh *bm)
 {
+	const UnwrapOptions options = {
+		.topology_from_uvs = true,
+		.only_selected = false,
+		.fill_holes = false,
+		.correct_aspect = false,
+	};
+
+	bool rotate = true;
+	bool ignore_pinned = false;
+
 	ParamHandle *handle;
-	handle = construct_param_handle(scene, ob, bm, true, false, false, false);
-	param_pack(handle, scene->toolsettings->uvcalc_margin, true, false);
+	handle = construct_param_handle(scene, ob, bm, &options);
+	param_pack(handle, scene->toolsettings->uvcalc_margin, rotate, ignore_pinned);
 	param_flush(handle);
 	param_delete(handle);
 }
 
 static void uvedit_pack_islands_multi(
         Scene *scene, Object **objects, const uint objects_len,
-        bool do_rotate, bool implicit, bool ignore_pinned)
+        const UnwrapOptions *options, bool rotate, bool ignore_pinned)
 {
 	ParamHandle *handle;
-	handle = construct_param_handle_multi(
-	        scene, objects, objects_len, implicit, false, true, true);
-	param_pack(handle, scene->toolsettings->uvcalc_margin, do_rotate, ignore_pinned);
+	handle = construct_param_handle_multi(scene, objects, objects_len, options);
+	param_pack(handle, scene->toolsettings->uvcalc_margin, rotate, ignore_pinned);
 	param_flush(handle);
 	param_delete(handle);
+
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
+		WM_main_add_notifier(NC_GEOM | ND_DATA, obedit->data);
+	}
 }
 
 static int pack_islands_exec(bContext *C, wmOperator *op)
 {
 	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Scene *scene = CTX_data_scene(C);
-	bool do_rotate = RNA_boolean_get(op->ptr, "rotate");
+
+	const UnwrapOptions options = {
+		.topology_from_uvs = true,
+		.only_selected = true,
+		.fill_holes = false,
+		.correct_aspect = true,
+	};
+
+	bool rotate = RNA_boolean_get(op->ptr, "rotate");
+	bool ignore_pinned = false;
 
 	uint objects_len = 0;
 	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, CTX_wm_view3d(C), &objects_len);
 
-	if (!uvedit_have_selection_multi(scene, objects, objects_len, true)) {
+	if (!uvedit_have_selection_multi(scene, objects, objects_len, &options)) {
 		MEM_freeN(objects);
 		return OPERATOR_CANCELLED;
 	}
@@ -879,13 +917,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op)
 	else
 		RNA_float_set(op->ptr, "margin", scene->toolsettings->uvcalc_margin);
 
-	uvedit_pack_islands_multi(scene, objects, objects_len, do_rotate, true, false);
-
-	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
-		Object *obedit = objects[ob_index];
-		DEG_id_tag_update(obedit->data, 0);
-		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	}
+	uvedit_pack_islands_multi(scene, objects, objects_len, &options, rotate, ignore_pinned);
 
 	MEM_freeN(objects);
 
@@ -918,18 +950,23 @@ static int average_islands_scale_exec(bContext *C, wmOperator *UNUSED(op))
 	ViewLayer *view_layer = CTX_data_view_layer(C);
 	ToolSettings *ts = scene->toolsettings;
 	const bool synced_selection = (ts->uv_flag & UV_SYNC_SELECTION) != 0;
-	const bool implicit = true;
-	ParamHandle *handle;
+
+	const UnwrapOptions options = {
+		.topology_from_uvs = true,
+		.only_selected = true,
+		.fill_holes = false,
+		.correct_aspect = true,
+	};
 
 	uint objects_len = 0;
 	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(view_layer, CTX_wm_view3d(C), &objects_len);
 
-	if (!uvedit_have_selection_multi(scene, objects, objects_len, implicit)) {
+	if (!uvedit_have_selection_multi(scene, objects, objects_len, &options)) {
 		MEM_freeN(objects);
 		return OPERATOR_CANCELLED;
 	}
 
-	handle = construct_param_handle_multi(scene, objects, objects_len, implicit, false, true, true);
+	ParamHandle *handle = construct_param_handle_multi(scene, objects, objects_len, &options);
 	param_average(handle, false);
 	param_flush(handle);
 	param_delete(handle);
@@ -942,7 +979,7 @@ static int average_islands_scale_exec(bContext *C, wmOperator *UNUSED(op))
 			continue;
 		}
 
-		DEG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 	}
 	MEM_freeN(objects);
@@ -975,7 +1012,6 @@ void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit)
 	ParamHandle *handle = NULL;
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 	const bool abf = (scene->toolsettings->unwrapper == 0);
-	const bool fillholes = (scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES) != 0;
 	bool use_subsurf;
 
 	modifier_unwrap_state(obedit, scene, &use_subsurf);
@@ -984,10 +1020,17 @@ void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit)
 		return;
 	}
 
+	const UnwrapOptions options = {
+		.topology_from_uvs = false,
+		.only_selected = false,
+		.fill_holes = (scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES) != 0,
+		.correct_aspect = (scene->toolsettings->uvcalc_flag & UVCALC_NO_ASPECT_CORRECT) == 0,
+	};
+
 	if (use_subsurf)
-		handle = construct_param_handle_subsurfed(scene, obedit, em, fillholes, false, true);
+		handle = construct_param_handle_subsurfed(scene, obedit, em, &options);
 	else
-		handle = construct_param_handle(scene, obedit, em->bm, false, fillholes, false, true);
+		handle = construct_param_handle(scene, obedit, em->bm, &options);
 
 	param_lscm_begin(handle, PARAM_TRUE, abf);
 
@@ -1031,17 +1074,6 @@ void ED_uvedit_live_unwrap_end(short cancel)
 	}
 }
 
-void ED_uvedit_live_unwrap(Scene *scene, Object *obedit)
-{
-	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-
-	if (scene->toolsettings->edge_mode_live_unwrap &&
-	    CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV))
-	{
-		ED_unwrap_lscm(scene, obedit, false, false); /* unwrap all not just sel */
-	}
-}
-
 /*************** UV Map Common Transforms *****************/
 
 #define VIEW_ON_EQUATOR 0
@@ -1386,22 +1418,22 @@ static void uv_map_clip_correct(Scene *scene, Object *ob, wmOperator *op)
 
 /* ******************** Unwrap operator **************** */
 
-/* assumes UV Map is checked, doesn't run update funcs */
-void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel, const bool pack)
+/* Assumes UV Map exists, doesn't run update funcs. */
+static void uvedit_unwrap(Scene *scene, Object *obedit, const UnwrapOptions *options)
 {
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
-	ParamHandle *handle;
+	if (!CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV)) {
+		return;
+	}
 
-	const bool fill_holes = (scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES) != 0;
-	const bool correct_aspect = (scene->toolsettings->uvcalc_flag & UVCALC_NO_ASPECT_CORRECT) == 0;
 	bool use_subsurf;
-
 	modifier_unwrap_state(obedit, scene, &use_subsurf);
 
+	ParamHandle *handle;
 	if (use_subsurf)
-		handle = construct_param_handle_subsurfed(scene, obedit, em, fill_holes, sel, correct_aspect);
+		handle = construct_param_handle_subsurfed(scene, obedit, em, options);
 	else
-		handle = construct_param_handle(scene, obedit, em->bm, false, fill_holes, sel, correct_aspect);
+		handle = construct_param_handle(scene, obedit, em->bm, options);
 
 	param_lscm_begin(handle, PARAM_FALSE, scene->toolsettings->unwrapper == 0);
 	param_lscm_solve(handle);
@@ -1409,15 +1441,39 @@ void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel, const bool pa
 
 	param_average(handle, true);
 
-	if (pack) {
-		param_pack(handle, scene->toolsettings->uvcalc_margin, false, true);
-	}
-
 	param_flush(handle);
 
 	param_delete(handle);
 }
 
+static void uvedit_unwrap_multi(Scene *scene, Object **objects, const int objects_len, const UnwrapOptions *options)
+{
+	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+		Object *obedit = objects[ob_index];
+		uvedit_unwrap(scene, obedit, options);
+		DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
+		WM_main_add_notifier(NC_GEOM | ND_DATA, obedit->data);
+	}
+}
+
+void ED_uvedit_live_unwrap(Scene *scene, Object **objects, int objects_len)
+{
+	if (scene->toolsettings->edge_mode_live_unwrap) {
+		const UnwrapOptions options = {
+			.topology_from_uvs = false,
+			.only_selected = false,
+			.fill_holes = (scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES) != 0,
+			.correct_aspect = (scene->toolsettings->uvcalc_flag & UVCALC_NO_ASPECT_CORRECT) == 0,
+		};
+
+		bool rotate = true;
+		bool ignore_pinned = true;
+
+		uvedit_unwrap_multi(scene, objects, objects_len, &options);
+		uvedit_pack_islands_multi(scene, objects, objects_len, &options, rotate, ignore_pinned);
+	}
+}
+
 enum {
 	UNWRAP_ERROR_NONUNIFORM = (1 << 0),
 	UNWRAP_ERROR_NEGATIVE = (1 << 1),
@@ -1428,10 +1484,7 @@ static int unwrap_exec(bContext *C, wmOperator *op)
 	ViewLayer *view_layer = CTX_data_view_layer(C);
 	Scene *scene = CTX_data_scene(C);
 	int method = RNA_enum_get(op->ptr, "method");
-	const bool fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
-	const bool correct_aspect = RNA_boolean_get(op->ptr, "correct_aspect");
 	const bool use_subsurf = RNA_boolean_get(op->ptr, "use_subsurf_data");
-	bool implicit = false;
 	int reported_errors = 0;
 	/* We will report an error unless at least one object
 	 * has the subsurf modifier in the right place. */
@@ -1440,7 +1493,17 @@ static int unwrap_exec(bContext *C, wmOperator *op)
 	uint objects_len = 0;
 	Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, CTX_wm_view3d(C), &objects_len);
 
-	if (!uvedit_have_selection_multi(scene, objects, objects_len, implicit)) {
+	const UnwrapOptions options = {
+		.topology_from_uvs = false,
+		.only_selected = true,
+		.fill_holes = RNA_boolean_get(op->ptr, "fill_holes"),
+		.correct_aspect = RNA_boolean_get(op->ptr, "correct_aspect"),
+	};
+
+	bool rotate = true;
+	bool ignore_pinned = true;
+
+	if (!uvedit_have_selection_multi(scene, objects, objects_len, &options)) {
 		MEM_freeN(objects);
 		return OPERATOR_CANCELLED;
 	}
@@ -1456,7 +1519,7 @@ static int unwrap_exec(bContext *C, wmOperator *op)
 		}
 
 		if (subsurf_error) {
-			/* Double up the check here but better keep ED_unwrap_lscm interface simple and not
+			/* Double up the check here but better keep uvedit_unwrap interface simple and not
 			 * pass operator for warning append. */
 			modifier_unwrap_state(obedit, scene, &use_subsurf_final);
 			if (use_subsurf_final) {
@@ -1501,24 +1564,18 @@ static int unwrap_exec(bContext *C, wmOperator *op)
 	else
 		RNA_float_set(op->ptr, "margin", scene->toolsettings->uvcalc_margin);
 
-	if (fill_holes) scene->toolsettings->uvcalc_flag |=  UVCALC_FILLHOLES;
+	if (options.fill_holes) scene->toolsettings->uvcalc_flag |=  UVCALC_FILLHOLES;
 	else scene->toolsettings->uvcalc_flag &= ~UVCALC_FILLHOLES;
 
-	if (correct_aspect) scene->toolsettings->uvcalc_flag &= ~UVCALC_NO_ASPECT_CORRECT;
+	if (options.correct_aspect) scene->toolsettings->uvcalc_flag &= ~UVCALC_NO_ASPECT_CORRECT;
 	else scene->toolsettings->uvcalc_flag |=  UVCALC_NO_ASPECT_CORRECT;
 
 	if (use_subsurf) scene->toolsettings->uvcalc_flag |= UVCALC_USESUBSURF;
 	else scene->toolsettings->uvcalc_flag &= ~UVCALC_USESUBSURF;
 
 	/* execute unwrap */
-	for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
-		Object *obedit = objects[ob_index];
-		ED_unwrap_lscm(scene, obedit, true, false);
-		DEG_id_tag_update(obedit->data, 0);
-		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-	}
-
-	uvedit_pack_islands_multi(scene, objects, objects_len, true, implicit, true);
+	uvedit_unwrap_multi(scene, objects, objects_len, &options);
+	uvedit_pack_islands_multi(scene, objects, objects_len, &options, rotate, ignore_pinned);
 
 	MEM_freeN(objects);
 
@@ -1672,7 +1729,7 @@ static int uv_from_view_exec(bContext *C, wmOperator *op)
 
 		if (changed) {
 			changed_multi = true;
-			DEG_id_tag_update(obedit->data, 0);
+			DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
 			WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 		}
 		else {
@@ -1754,7 +1811,7 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op))
 
 		ED_mesh_uv_loop_reset(C, me);
 
-		DEG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 	}
 	MEM_freeN(objects);
@@ -1867,7 +1924,7 @@ static int sphere_project_exec(bContext *C, wmOperator *op)
 
 		uv_map_clip_correct(scene, obedit, op);
 
-		DEG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 	}
 	MEM_freeN(objects);
@@ -1955,7 +2012,7 @@ static int cylinder_project_exec(bContext *C, wmOperator *op)
 
 		uv_map_clip_correct(scene, obedit, op);
 
-		DEG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 	}
 	MEM_freeN(objects);
@@ -2072,7 +2129,7 @@ static int cube_project_exec(bContext *C, wmOperator *op)
 
 		uv_map_clip_correct(scene, obedit, op);
 
-		DEG_id_tag_update(obedit->data, 0);
+		DEG_id_tag_update(obedit->data, ID_RECALC_GEOMETRY);
 		WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 	}
 	MEM_freeN(objects);