diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2005-04-23 05:36:08 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2005-04-23 05:36:08 +0400 |
commit | c333ba8dfaa8e92483d29f3cf77988ce0e1beb3a (patch) | |
tree | b2a7ea6a784d0376f2c9fc4e77b5fbddd7f9e373 /source/blender/include | |
parent | 375cf60462cadb8625b13f9b256f69df15831336 (diff) |
Merging over some uv editor tweaks from tuhopuu:
- Moved Weld/Align out of transform code, now it's a menu.
- Removed confirmation popups for LSCM unwrapping in the uv editor, didn't
make sense anymore now we have undo.
- Extended select linked, to work more like it does in edit mode:
- L: select linked uvs/faces under the mouse
- Shift+L: select/deselect linked uvs/faces under the mouse
(like shift+click for selecting single uvs/faces)
- Ctrl+L: how L worked before
- More accurate uv selection: when selecting one uv from a group of uvs that
are in the same position, it now selects the uv belonging to the face the
mouse is over, instead of a random uv.
- 'View Selected' (numpad .-key) for both faceselect mode and the uv editor.
Diffstat (limited to 'source/blender/include')
-rw-r--r-- | source/blender/include/BDR_editface.h | 4 | ||||
-rw-r--r-- | source/blender/include/BDR_unwrapper.h | 2 | ||||
-rw-r--r-- | source/blender/include/BIF_editsima.h | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/source/blender/include/BDR_editface.h b/source/blender/include/BDR_editface.h index 2670e5246f3..7eaf47d15d8 100644 --- a/source/blender/include/BDR_editface.h +++ b/source/blender/include/BDR_editface.h @@ -43,12 +43,12 @@ void default_tface(struct TFace *tface); void make_tfaces(struct Mesh *me); void reveal_tface(void); void hide_tface(void); -void select_linked_tfaces(void); +void select_linked_tfaces(int mode); void deselectall_tface(void); void selectswap_tface(void); void rotate_uv_tface(void); void minmax_tface(float *min, float *max); -int face_pick(struct Mesh *me, short x, short y); +int face_pick(struct Mesh *me, short x, short y, unsigned int *index); void face_select(void); void face_borderselect(void); float CalcNormUV(float *a, float *b, float *c); diff --git a/source/blender/include/BDR_unwrapper.h b/source/blender/include/BDR_unwrapper.h index ffb1c6b7c5c..d1e6caaa58b 100644 --- a/source/blender/include/BDR_unwrapper.h +++ b/source/blender/include/BDR_unwrapper.h @@ -35,7 +35,7 @@ void set_seamtface(void); /* set TF_SEAM flags in tfaces */ void unwrap_lscm(void); /* unwrap selected tfaces */ -void select_linked_tfaces_with_seams(void); +void select_linked_tfaces_with_seams(int mode, Mesh *me, unsigned int index); #endif /* BDR_UNWRAPPER_H */ diff --git a/source/blender/include/BIF_editsima.h b/source/blender/include/BIF_editsima.h index 00ba13a81dc..ac1b5c09356 100644 --- a/source/blender/include/BIF_editsima.h +++ b/source/blender/include/BIF_editsima.h @@ -30,6 +30,9 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#define TF_PIN_MASK(id) (TF_PIN1 << id) +#define TF_SEL_MASK(id) (TF_SEL1 << id) + int is_uv_tface_editing_allowed(void); int is_uv_tface_editing_allowed_silent(void); void borderselect_sima(void); @@ -39,12 +42,16 @@ void select_swap_tface_uv(void); void tface_do_clip(void); void transform_tface_uv(int mode); void mirrormenu_tface_uv(void); +void mirror_tface_uv(char mirroraxis); void hide_tface_uv(int swap); void reveal_tface_uv(void); void stitch_uv_tface(int mode); void unlink_selection(void); -void select_linked_tface_uv(void); +void select_linked_tface_uv(int mode); void toggle_uv_select(int mode); void pin_tface_uv(int mode); int minmax_tface_uv(float *min, float *max); +void weld_align_menu_tface_uv(void); +void weld_align_tface_uv(char tool); +void get_connected_limit_tface_uv(float *limit); |