also enable edge-seam unwrapping when running the mark_seam operator.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 10 Mar 2011 06:06:55 +0000 (06:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 10 Mar 2011 06:06:55 +0000 (06:06 +0000)
release/scripts/ui/space_view3d_toolbar.py
source/blender/editors/mesh/editmesh_mods.c
source/blender/makesrna/intern/rna_scene.c

index 985844d77da09714e2809e09b1d84325abd9cc98..44c0b6ef0a78edf299af402ca42926fa83cb24ec 100644 (file)
@@ -182,9 +182,6 @@ class VIEW3D_PT_tools_meshedit_options(View3DPanel, bpy.types.Panel):
 
             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 ****************
index 5075ae94f8d94b336662f7e75c22dce15a7034fc..a6f05b8c2f6229493da0084dcf4ae08abccfa141 100644 (file)
@@ -3727,6 +3727,7 @@ void EM_deselect_by_material(EditMesh *em, int index)
 
 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 @@ static int editmesh_mark_seam(bContext *C, wmOperator *op)
                }
        }
 
+       /* 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);
index db3ecb5dd5dca93f6e37931b5c4174f004b7e499..740cb1b36c9a74a7ac184828058a4d038c3d1a1d 100644 (file)
@@ -1208,7 +1208,7 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 
        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);