diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-10 09:06:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-10 09:06:55 +0300 |
commit | d59e208216c4299b2fff0a9749bb21fca51c51d5 (patch) | |
tree | 20b91c2992951bba3c27a02e37728a89c207a02f /source/blender | |
parent | 3ad8fd44c4047d0ee95eca50de066ad87419c738 (diff) |
also enable edge-seam unwrapping when running the mark_seam operator.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/mesh/editmesh_mods.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 5075ae94f8d..a6f05b8c2f6 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -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); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index db3ecb5dd5d..740cb1b36c9 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -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); |