Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
-rw-r--r--source/blender/editors/uvedit/uvedit_ops.c50
1 files changed, 26 insertions, 24 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index a0e0ec30912..8998b59b353 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
@@ -1037,14 +1037,14 @@ static int align_exec(bContext *C, wmOperator *op)
void UV_OT_align(wmOperatorType *ot)
{
static EnumPropertyItem axis_items[] = {
- {'a', "ALIGN_AUTO", 0, "Align Auto", "Automatically choose the axis on which there is most alignment already."},
- {'x', "ALIGN_X", 0, "Align X", "Align UVs on X axis."},
- {'y', "ALIGN_Y", 0, "Align Y", "Align UVs on Y axis."},
+ {'a', "ALIGN_AUTO", 0, "Align Auto", "Automatically choose the axis on which there is most alignment already"},
+ {'x', "ALIGN_X", 0, "Align X", "Align UVs on X axis"},
+ {'y', "ALIGN_Y", 0, "Align Y", "Align UVs on Y axis"},
{0, NULL, 0, NULL, NULL}};
/* identifiers */
ot->name= "Align";
- ot->description= "Align selected UV vertices to an axis.";
+ ot->description= "Align selected UV vertices to an axis";
ot->idname= "UV_OT_align";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1069,7 +1069,7 @@ void UV_OT_weld(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Weld";
- ot->description= "Weld selected UV vertices together.";
+ ot->description= "Weld selected UV vertices together";
ot->idname= "UV_OT_weld";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1255,7 +1255,7 @@ void UV_OT_stitch(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Stitch";
- ot->description= "Stitch selected UV vertices by proximity.";
+ ot->description= "Stitch selected UV vertices by proximity";
ot->idname= "UV_OT_stitch";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1312,7 +1312,7 @@ void UV_OT_select_inverse(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Inverse";
- ot->description= "Select inverse of (un)selected UV vertices.";
+ ot->description= "Select inverse of (un)selected UV vertices";
ot->idname= "UV_OT_select_inverse";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1412,7 +1412,7 @@ void UV_OT_select_all(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select or Deselect All";
- ot->description= "Change selection of all UV vertices.";
+ ot->description= "Change selection of all UV vertices";
ot->idname= "UV_OT_select_all";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1747,7 +1747,7 @@ void UV_OT_select(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select";
- ot->description= "Select UV vertice.";
+ ot->description= "Select UV vertice";
ot->idname= "UV_OT_select";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1796,7 +1796,7 @@ void UV_OT_select_loop(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Loop Select";
- ot->description= "Select a loop of connected UV vertices.";
+ ot->description= "Select a loop of connected UV vertices";
ot->idname= "UV_OT_select_loop";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1877,7 +1877,7 @@ void UV_OT_select_linked(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Linked";
- ot->description= "Select all UV vertices linked to the active UV map.";
+ ot->description= "Select all UV vertices linked to the active UV map";
ot->idname= "UV_OT_select_linked";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1904,7 +1904,7 @@ void UV_OT_select_linked_pick(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Select Linked Pick";
- ot->description= "Select all UV vertices linked under the mouse.";
+ ot->description= "Select all UV vertices linked under the mouse";
ot->idname= "UV_OT_select_linked_pick";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -1965,7 +1965,7 @@ void UV_OT_unlink_selection(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Unlink Selection";
- ot->description= "Unlink selected UV vertices from active UV map.";
+ ot->description= "Unlink selected UV vertices from active UV map";
ot->idname= "UV_OT_unlink_selection";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2246,7 +2246,7 @@ void UV_OT_select_border(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Border Select";
- ot->description= "Select UV vertices using border selection.";
+ ot->description= "Select UV vertices using border selection";
ot->idname= "UV_OT_select_border";
/* api callbacks */
@@ -2335,7 +2335,7 @@ void UV_OT_circle_select(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Circle Select";
- ot->description= "Select UV vertices using circle selection.";
+ ot->description= "Select UV vertices using circle selection";
ot->idname= "UV_OT_circle_select";
/* api callbacks */
@@ -2411,7 +2411,7 @@ void UV_OT_snap_cursor(wmOperatorType *ot)
/* identifiers */
ot->name= "Snap Cursor";
- ot->description= "Snap cursor to target type.";
+ ot->description= "Snap cursor to target type";
ot->idname= "UV_OT_snap_cursor";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2653,7 +2653,7 @@ void UV_OT_snap_selection(wmOperatorType *ot)
/* identifiers */
ot->name= "Snap Selection";
- ot->description= "Snap selected UV vertices to target type.";
+ ot->description= "Snap selected UV vertices to target type";
ot->idname= "UV_OT_snap_selection";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2708,7 +2708,7 @@ void UV_OT_pin(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Pin";
- ot->description= "Set/clear selected UV vertices as anchored between multiple unwrap operations.";
+ ot->description= "Set/clear selected UV vertices as anchored between multiple unwrap operations";
ot->idname= "UV_OT_pin";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2754,7 +2754,7 @@ void UV_OT_select_pinned(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Selected Pinned";
- ot->description= "Select all pinned UV vertices.";
+ ot->description= "Select all pinned UV vertices";
ot->idname= "UV_OT_select_pinned";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2896,7 +2896,7 @@ void UV_OT_hide(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Hide Selected";
- ot->description= "Hide (un)selected UV vertices.";
+ ot->description= "Hide (un)selected UV vertices";
ot->idname= "UV_OT_hide";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -3030,7 +3030,7 @@ void UV_OT_reveal(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Reveal Hidden";
- ot->description= "Reveal all hidden UV vertices.";
+ ot->description= "Reveal all hidden UV vertices";
ot->idname= "UV_OT_reveal";
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -3073,7 +3073,7 @@ void UV_OT_cursor_set(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Set 2D Cursor";
- ot->description= "Set 2D cursor location.";
+ ot->description= "Set 2D cursor location";
ot->idname= "UV_OT_cursor_set";
/* api callbacks */
@@ -3139,7 +3139,7 @@ void UV_OT_tile_set(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Set Tile";
- ot->description= "Set UV image tile coordinates.";
+ ot->description= "Set UV image tile coordinates";
ot->idname= "UV_OT_tile_set";
/* api callbacks */
@@ -3223,6 +3223,8 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "UV_OT_select_inverse", IKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "UV_OT_select_pinned", PKEY, KM_PRESS, KM_SHIFT, 0);
+ WM_keymap_add_item(keymap, "UV_OT_weld", WKEY, KM_PRESS, 0, 0);
+
/* uv operations */
WM_keymap_add_item(keymap, "UV_OT_stitch", VKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "UV_OT_pin", PKEY, KM_PRESS, 0, 0);