From f756a047e6ec13762f7f90dd03b72794e986459c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 15 Oct 2010 09:07:19 +0000 Subject: bugfix [#24264] toggle UV selection fails. was using the 4th selection flag on tri's. also some minor changes, removed unused args and corrected some comments. --- source/blender/editors/include/ED_uvedit.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source/blender/editors/include/ED_uvedit.h') diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 1710a8439d1..737d124b494 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -41,7 +41,6 @@ void ED_operatortypes_uvedit(void); void ED_keymap_uvedit(struct wmKeyConfig *keyconf); void ED_uvedit_assign_image(struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma); -void ED_uvedit_set_tile(struct bContext *C, struct Scene *scene, struct Object *obedit, struct Image *ima, int curtile, int dotile); int ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obedit, float *min, float *max); int ED_uvedit_test_silent(struct Object *obedit); -- cgit v1.2.3 From fa4bbbb249bf9706e9c71d34748fbde87fa385fb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 4 Dec 2010 13:00:28 +0000 Subject: Maintenance, - remove some redundant declarations - changed VertexTangent and Path structs to avoid compiler alignment padding. --- source/blender/editors/include/ED_uvedit.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/include/ED_uvedit.h') diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 737d124b494..353f89323e6 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -46,10 +46,19 @@ int ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obed int ED_uvedit_test_silent(struct Object *obedit); int ED_uvedit_test(struct Object *obedit); -int uvedit_face_visible(struct Scene *scene, struct Image *ima, struct EditFace *efa, struct MTFace *tf); -int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf); +/* visibility and selection */ int uvedit_edge_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); +int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf); +int uvedit_face_visible_nolocal(struct Scene *scene, struct EditFace *efa); +int uvedit_face_visible(struct Scene *scene, struct Image *ima, struct EditFace *efa, struct MTFace *tf); int uvedit_uv_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); +void uvedit_edge_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); +void uvedit_edge_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); +void uvedit_face_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf); +void uvedit_face_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf); +void uvedit_uv_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); +void uvedit_uv_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); + int ED_uvedit_nearest_uv(struct Scene *scene, struct Object *obedit, struct Image *ima, float co[2], float uv[2]); -- cgit v1.2.3 From 8b7482892b2ecb456be60b42fe1625156d19e954 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 14 Feb 2011 17:55:27 +0000 Subject: made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors. --- source/blender/editors/include/ED_uvedit.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/editors/include/ED_uvedit.h') diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 353f89323e6..a2a0cefc55b 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -67,5 +67,7 @@ void ED_uvedit_live_unwrap_begin(struct Scene *scene, struct Object *obedit); void ED_uvedit_live_unwrap_re_solve(void); void ED_uvedit_live_unwrap_end(short cancel); +void draw_uvedit_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene, struct Object *obedit); + #endif /* ED_UVEDIT_H */ -- cgit v1.2.3 From 8172207d203ef909585c9e782ea34a52ab2cf1c1 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 21 Feb 2011 07:25:24 +0000 Subject: doxygen: editor entry --- source/blender/editors/include/ED_uvedit.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/include/ED_uvedit.h') diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index a2a0cefc55b..a0c4148c055 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -25,6 +25,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file ED_uvedit.h + * \ingroup editors + */ + #ifndef ED_UVEDIT_H #define ED_UVEDIT_H -- cgit v1.2.3