From 283926aa2d0c6366d92a4f38e994e843b73659f6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 9 Feb 2009 20:58:31 +0000 Subject: 2.5: UV Editor module porting pretty much finished now, only missing still is mirror transform. This commits adds the remaining operators: * UV mapping operators (U key menu): cube, sphere, cylinder, etc. * Hide/Show operators. And solves most XXX's, including: * Fix bad includes and calls into space image. * Aspect ratio correction. * Create UVs if they don't exist yet on unwrap. * Assign image to UVs. * Drawing proportional edit circle. --- source/blender/editors/include/ED_image.h | 14 ++++++++++++++ source/blender/editors/include/ED_mesh.h | 4 ++++ source/blender/editors/include/ED_uvedit.h | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/include') diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index 84225d85877..f015001c0d5 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -33,9 +33,23 @@ struct bContext; /* space_image.c, exported for transform */ struct Image *ED_space_image(struct SpaceImage *sima); +void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima); + +struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima); void ED_space_image_size(struct SpaceImage *sima, int *width, int *height); +void ED_space_image_aspect(struct SpaceImage *sima, float *aspx, float *aspy); +void ED_space_image_zoom(struct SpaceImage *sima, struct ARegion *ar, float *zoomx, float *zoomy); void ED_space_image_uv_aspect(struct SpaceImage *sima, float *aspx, float *aspy); +void ED_image_size(struct Image *ima, int *width, int *height); +void ED_image_aspect(struct Image *ima, float *aspx, float *aspy); +void ED_image_uv_aspect(struct Image *ima, float *aspx, float *aspy); + +int ED_space_image_show_render(struct SpaceImage *sima); +int ED_space_image_show_paint(struct SpaceImage *sima); +int ED_space_image_show_uvedit(struct SpaceImage *sima, struct Object *obedit); +int ED_space_image_show_uvshadow(struct SpaceImage *sima, struct Object *obedit); + /* image_render.c, export for screen_ops.c, render operator */ void ED_space_image_output(struct bContext *C); diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index bd997e93e9b..e32243fc28f 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -119,6 +119,7 @@ void EM_deselect_flush(struct EditMesh *em); void EM_selectmode_set(struct EditMesh *em); void EM_select_flush(struct EditMesh *em); void EM_convertsel(struct EditMesh *em, short oldmode, short selectmode); +void EM_validate_selections(struct EditMesh *em); /* exported to transform */ int EM_get_actSelection(struct EditMesh *em, struct EditSelection *ese); @@ -139,6 +140,9 @@ void EM_free_backbuf(void); int EM_init_backbuf_border(struct ViewContext *vc, short xmin, short ymin, short xmax, short ymax); int EM_init_backbuf_circle(struct ViewContext *vc, short xs, short ys, short rads); +void EM_hide_mesh(struct EditMesh *em, int swap); +void EM_reveal_mesh(struct EditMesh *em); + /* editface.c */ struct MTFace *EM_get_active_mtface(struct EditMesh *em, struct EditFace **act_efa, struct MCol **mcol, int sloppy); diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index fa106ff4360..74a9be75db6 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -28,6 +28,7 @@ #ifndef ED_UVEDIT_H #define ED_UVEDIT_H +struct bContext; struct Scene; struct Object; struct MTFace; @@ -40,7 +41,7 @@ void ED_operatortypes_uvedit(void); void ED_keymap_uvedit(struct wmWindowManager *wm); void ED_uvedit_assign_image(struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma); -void ED_uvedit_set_tile(struct Scene *scene, struct Object *obedit, struct Image *ima, int curtile, int dotile); +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