[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35447] trunk/blender: also enable edge-seam unwrapping when running the mark_seam operator.

[Campbell Barton]

Revision: 35447
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35447
Author:   campbellbarton
Date:     2011-03-10 06:06:55 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
also enable edge-seam unwrapping when running the mark_seam operator.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d_toolbar.py
    trunk/blender/source/blender/editors/mesh/editmesh_mods.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2011-03-10 05:52:16 UTC (rev 35446)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2011-03-10 06:06:55 UTC (rev 35447)
@@ -182,9 +182,6 @@
 
             col.label("Edge Select Mode")
             col.prop(ts, "edge_path_mode", text="")
-
-            col = layout.column(align=True)
-            col.active = ts.edge_path_mode == 'SEAM'
             col.prop(context.tool_settings, "edge_path_live_unwrap")
 
 # ********** default tools for editmode_curve ****************

Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c	2011-03-10 05:52:16 UTC (rev 35446)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c	2011-03-10 06:06:55 UTC (rev 35447)
@@ -3727,6 +3727,7 @@
 
 static int editmesh_mark_seam(bContext *C, wmOperator *op)
 {
+	Scene *scene= CTX_data_scene(C);
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	Mesh *me= ((Mesh *)obedit->data);
@@ -3757,6 +3758,13 @@
 		}
 	}
 
+	/* live unwrap while tagging */
+	if(	(scene->toolsettings->edge_mode_live_unwrap) &&
+		(CustomData_has_layer(&em->fdata, CD_MTFACE))
+	) {
+		ED_unwrap_lscm(scene, obedit, FALSE); /* unwrap all not just sel */
+	}
+
 	BKE_mesh_end_editmesh(obedit->data, em);
 
 	DAG_id_tag_update(obedit->data, 0);

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2011-03-10 05:52:16 UTC (rev 35446)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2011-03-10 06:06:55 UTC (rev 35447)
@@ -1208,7 +1208,7 @@
 
 	prop= RNA_def_property(srna, "edge_path_live_unwrap", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "edge_mode_live_unwrap", 1);
-	RNA_def_property_ui_text(prop, "Live Unwrap", "Tagging edges re-calculates unwrap");
+	RNA_def_property_ui_text(prop, "Live Unwrap", "Changing edges seam re-calculates UV unwrap");
 
 	/* etch-a-ton */
 	prop= RNA_def_property(srna, "use_bone_sketching", PROP_BOOLEAN, PROP_NONE);